diff --git a/classes/database/instance.ts b/classes/database/instance.ts
index 446eda28..7315a38d 100644
--- a/classes/database/instance.ts
+++ b/classes/database/instance.ts
@@ -5,7 +5,7 @@ import {
     type ValidationError,
 } from "@versia/federation";
 import type { InstanceMetadata } from "@versia/federation/types";
-import { User, db } from "@versia/kit/db";
+import { db } from "@versia/kit/db";
 import { Instances } from "@versia/kit/tables";
 import chalk from "chalk";
 import {
@@ -18,6 +18,7 @@ import {
 } from "drizzle-orm";
 import { config } from "~/packages/config-manager/index.ts";
 import { BaseInterface } from "./base.ts";
+import { User } from "./user.ts";
 
 type InstanceType = InferSelectModel<typeof Instances>;
 
diff --git a/classes/database/like.ts b/classes/database/like.ts
index 3ca22634..5759b2ac 100644
--- a/classes/database/like.ts
+++ b/classes/database/like.ts
@@ -1,6 +1,6 @@
 import { RolePermission } from "@versia/client/types";
 import type { Delete, LikeExtension } from "@versia/federation/types";
-import { Note, User, db } from "@versia/kit/db";
+import { db } from "@versia/kit/db";
 import {
     Likes,
     type Notes,
@@ -19,6 +19,8 @@ import {
 import { z } from "zod";
 import { config } from "~/packages/config-manager/index.ts";
 import { BaseInterface } from "./base.ts";
+import { Note } from "./note.ts";
+import { User } from "./user.ts";
 
 type LikeType = InferSelectModel<typeof Likes> & {
     liker: InferSelectModel<typeof Users>;
diff --git a/classes/database/note.ts b/classes/database/note.ts
index b145d276..0cc6e3cd 100644
--- a/classes/database/note.ts
+++ b/classes/database/note.ts
@@ -14,15 +14,7 @@ import type {
     Delete as VersiaDelete,
     Note as VersiaNote,
 } from "@versia/federation/types";
-import {
-    Application,
-    Attachment,
-    Emoji,
-    type Instance,
-    Notification,
-    User,
-    db,
-} from "@versia/kit/db";
+import { type Instance, Notification, db } from "@versia/kit/db";
 import {
     Attachments,
     EmojiToNote,
@@ -50,7 +42,11 @@ import {
     parseTextMentions,
 } from "~/classes/functions/status";
 import { config } from "~/packages/config-manager";
+import { Application } from "./application.ts";
+import { Attachment } from "./attachment.ts";
 import { BaseInterface } from "./base.ts";
+import { Emoji } from "./emoji.ts";
+import { User } from "./user.ts";
 
 type NoteType = InferSelectModel<typeof Notes>;
 
diff --git a/classes/database/relationship.ts b/classes/database/relationship.ts
index 19e878d9..5e5e4b8d 100644
--- a/classes/database/relationship.ts
+++ b/classes/database/relationship.ts
@@ -1,5 +1,5 @@
 import type { Relationship as APIRelationship } from "@versia/client/types";
-import { type User, db } from "@versia/kit/db";
+import { db } from "@versia/kit/db";
 import { Relationships } from "@versia/kit/tables";
 import {
     type InferInsertModel,
@@ -12,6 +12,7 @@ import {
 } from "drizzle-orm";
 import { z } from "zod";
 import { BaseInterface } from "./base.ts";
+import type { User } from "./user.ts";
 
 type RelationshipType = InferSelectModel<typeof Relationships>;
 
diff --git a/classes/database/timeline.ts b/classes/database/timeline.ts
index 57c03c96..fca146e2 100644
--- a/classes/database/timeline.ts
+++ b/classes/database/timeline.ts
@@ -1,7 +1,9 @@
-import { Note, Notification, User } from "@versia/kit/db";
 import { Notes, Notifications, Users } from "@versia/kit/tables";
 import { type SQL, gt } from "drizzle-orm";
 import { config } from "~/packages/config-manager";
+import { Note } from "./note.ts";
+import { Notification } from "./notification.ts";
+import { User } from "./user.ts";
 
 enum TimelineType {
     Note = "Note",
diff --git a/classes/database/user.ts b/classes/database/user.ts
index 9a5856df..478af0d6 100644
--- a/classes/database/user.ts
+++ b/classes/database/user.ts
@@ -19,16 +19,7 @@ import type {
     Unfollow,
     User as VersiaUser,
 } from "@versia/federation/types";
-import {
-    Emoji,
-    Instance,
-    Like,
-    type Note,
-    Notification,
-    Relationship,
-    Role,
-    db,
-} from "@versia/kit/db";
+import { Notification, db } from "@versia/kit/db";
 import {
     EmojiToUser,
     Likes,
@@ -66,6 +57,12 @@ import { searchManager } from "~/classes/search/search-manager";
 import { type Config, config } from "~/packages/config-manager";
 import type { KnownEntity } from "~/types/api.ts";
 import { BaseInterface } from "./base.ts";
+import { Emoji } from "./emoji.ts";
+import { Instance } from "./instance.ts";
+import { Like } from "./like.ts";
+import type { Note } from "./note.ts";
+import { Relationship } from "./relationship.ts";
+import { Role } from "./role.ts";
 
 type UserWithInstance = InferSelectModel<typeof Users> & {
     instance: typeof Instance.$type | null;