diff --git a/bun.lockb b/bun.lockb
index 3e4fe997..dced7f28 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/classes/functions/status.ts b/classes/functions/status.ts
index 2bea537e..88dbbdd7 100644
--- a/classes/functions/status.ts
+++ b/classes/functions/status.ts
@@ -2,8 +2,10 @@ import { mentionValidator } from "@/api";
 import { sanitizeHtml, sanitizeHtmlInline } from "@/sanitization";
 import markdownItTaskLists from "@hackmd/markdown-it-task-lists";
 import { getLogger } from "@logtape/logtape";
-import { SignatureConstructor } from "@lysand-org/federation";
-import { FederationRequester } from "@lysand-org/federation/requester";
+import {
+    FederationRequester,
+    SignatureConstructor,
+} from "@lysand-org/federation";
 import type { ContentFormat } from "@lysand-org/federation/types";
 import { config } from "config-manager";
 import {
diff --git a/cli/commands/federation/user/fetch.ts b/cli/commands/federation/user/fetch.ts
index aa0e4041..3cf5e93e 100644
--- a/cli/commands/federation/user/fetch.ts
+++ b/cli/commands/federation/user/fetch.ts
@@ -1,6 +1,8 @@
 import { parseUserAddress, userAddressValidator } from "@/api";
-import { SignatureConstructor } from "@lysand-org/federation";
-import { FederationRequester } from "@lysand-org/federation/requester";
+import {
+    FederationRequester,
+    SignatureConstructor,
+} from "@lysand-org/federation";
 import { Args } from "@oclif/core";
 import chalk from "chalk";
 import ora from "ora";
diff --git a/cli/commands/federation/user/finger.ts b/cli/commands/federation/user/finger.ts
index c3f54fd0..37dfc4eb 100644
--- a/cli/commands/federation/user/finger.ts
+++ b/cli/commands/federation/user/finger.ts
@@ -1,6 +1,8 @@
 import { parseUserAddress, userAddressValidator } from "@/api";
-import { SignatureConstructor } from "@lysand-org/federation";
-import { FederationRequester } from "@lysand-org/federation/requester";
+import {
+    FederationRequester,
+    SignatureConstructor,
+} from "@lysand-org/federation";
 import { Args } from "@oclif/core";
 import chalk from "chalk";
 import ora from "ora";
diff --git a/package.json b/package.json
index c8206fbd..f7cd2f13 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
         "@json2csv/plainjs": "^7.0.6",
         "@logtape/logtape": "npm:@jsr/logtape__logtape@0.4.2",
         "@lysand-org/client": "^0.2.4",
-        "@lysand-org/federation": "^2.1.3",
+        "@lysand-org/federation": "2.1.8",
         "@oclif/core": "^4.0.12",
         "@tufjs/canonical-json": "^2.0.0",
         "altcha-lib": "^0.4.0",
diff --git a/packages/database-interface/user.ts b/packages/database-interface/user.ts
index 6d5a69cf..edf007fd 100644
--- a/packages/database-interface/user.ts
+++ b/packages/database-interface/user.ts
@@ -6,8 +6,10 @@ import type {
     Account as ApiAccount,
     Mention as ApiMention,
 } from "@lysand-org/client/types";
-import { EntityValidator } from "@lysand-org/federation";
-import type { FederationRequester } from "@lysand-org/federation/requester";
+import {
+    EntityValidator,
+    type FederationRequester,
+} from "@lysand-org/federation";
 import type { Entity, User as LysandUser } from "@lysand-org/federation/types";
 import {
     type InferInsertModel,
diff --git a/server/api/api/v1/accounts/lookup/index.ts b/server/api/api/v1/accounts/lookup/index.ts
index 3b9910f1..c58c52ba 100644
--- a/server/api/api/v1/accounts/lookup/index.ts
+++ b/server/api/api/v1/accounts/lookup/index.ts
@@ -2,8 +2,10 @@ import { applyConfig, auth, handleZodError } from "@/api";
 import { errorResponse, jsonResponse } from "@/response";
 import type { Hono } from "@hono/hono";
 import { zValidator } from "@hono/zod-validator";
-import { SignatureConstructor } from "@lysand-org/federation";
-import { FederationRequester } from "@lysand-org/federation/requester";
+import {
+    FederationRequester,
+    SignatureConstructor,
+} from "@lysand-org/federation";
 import { eq } from "drizzle-orm";
 import {
     anyOf,
diff --git a/server/api/api/v1/accounts/search/index.ts b/server/api/api/v1/accounts/search/index.ts
index a586a99a..9b300c53 100644
--- a/server/api/api/v1/accounts/search/index.ts
+++ b/server/api/api/v1/accounts/search/index.ts
@@ -2,8 +2,10 @@ import { applyConfig, auth, handleZodError } from "@/api";
 import { errorResponse, jsonResponse } from "@/response";
 import type { Hono } from "@hono/hono";
 import { zValidator } from "@hono/zod-validator";
-import { SignatureConstructor } from "@lysand-org/federation";
-import { FederationRequester } from "@lysand-org/federation/requester";
+import {
+    FederationRequester,
+    SignatureConstructor,
+} from "@lysand-org/federation";
 import { eq, ilike, not, or, sql } from "drizzle-orm";
 import {
     anyOf,
diff --git a/server/api/api/v2/search/index.ts b/server/api/api/v2/search/index.ts
index c853c3d6..d32922f6 100644
--- a/server/api/api/v2/search/index.ts
+++ b/server/api/api/v2/search/index.ts
@@ -8,8 +8,10 @@ import {
 import { errorResponse, jsonResponse } from "@/response";
 import type { Hono } from "@hono/hono";
 import { zValidator } from "@hono/zod-validator";
-import { SignatureConstructor } from "@lysand-org/federation";
-import { FederationRequester } from "@lysand-org/federation/requester";
+import {
+    FederationRequester,
+    SignatureConstructor,
+} from "@lysand-org/federation";
 import { and, eq, inArray, sql } from "drizzle-orm";
 import { z } from "zod";
 import { searchManager } from "~/classes/search/search-manager";
diff --git a/server/api/well-known/webfinger/index.ts b/server/api/well-known/webfinger/index.ts
index b772f997..d45cc285 100644
--- a/server/api/well-known/webfinger/index.ts
+++ b/server/api/well-known/webfinger/index.ts
@@ -8,11 +8,11 @@ import { errorResponse, jsonResponse } from "@/response";
 import type { Hono } from "@hono/hono";
 import { zValidator } from "@hono/zod-validator";
 import { getLogger } from "@logtape/logtape";
-import { SignatureConstructor } from "@lysand-org/federation";
 import {
     FederationRequester,
     type ResponseError,
-} from "@lysand-org/federation/requester";
+    SignatureConstructor,
+} from "@lysand-org/federation";
 import { and, eq, isNull } from "drizzle-orm";
 import { lookup } from "mime-types";
 import { z } from "zod";