diff --git a/apps/server/src/share/shaca/entities/sattachment.ts b/apps/server/src/share/shaca/entities/sattachment.ts
index 1fbb02054..11d3af096 100644
--- a/apps/server/src/share/shaca/entities/sattachment.ts
+++ b/apps/server/src/share/shaca/entities/sattachment.ts
@@ -5,7 +5,7 @@ import utils from "../../../services/utils.js";
 import AbstractShacaEntity from "./abstract_shaca_entity.js";
 import type SNote from "./snote.js";
 import type { Blob } from "../../../services/blob-interface.js";
-import type { SAttachmentRow } from "@triliumnext/commons";
+import type { SAttachmentRow } from "./rows.js";
 
 class SAttachment extends AbstractShacaEntity {
     private attachmentId: string;
diff --git a/apps/server/src/share/shaca/entities/sattribute.ts b/apps/server/src/share/shaca/entities/sattribute.ts
index 7dfaad3b6..dccdea83f 100644
--- a/apps/server/src/share/shaca/entities/sattribute.ts
+++ b/apps/server/src/share/shaca/entities/sattribute.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 import AbstractShacaEntity from "./abstract_shaca_entity.js";
-import type { SAttributeRow } from "@triliumnext/commons";
+import type { SAttributeRow } from "./rows.js";
 import type SNote from "./snote.js";
 
 class SAttribute extends AbstractShacaEntity {
diff --git a/apps/server/src/share/shaca/entities/sbranch.ts b/apps/server/src/share/shaca/entities/sbranch.ts
index dca2856e7..a1bd6ee53 100644
--- a/apps/server/src/share/shaca/entities/sbranch.ts
+++ b/apps/server/src/share/shaca/entities/sbranch.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 import AbstractShacaEntity from "./abstract_shaca_entity.js";
-import type { SBranchRow } from "@triliumnext/commons";
+import type { SBranchRow } from "./rows.js";
 import type SNote from "./snote.js";
 
 class SBranch extends AbstractShacaEntity {
diff --git a/apps/server/src/share/shaca/entities/snote.ts b/apps/server/src/share/shaca/entities/snote.ts
index ff33b76ef..6b192b57e 100644
--- a/apps/server/src/share/shaca/entities/snote.ts
+++ b/apps/server/src/share/shaca/entities/snote.ts
@@ -8,7 +8,7 @@ import type { Blob } from "../../../services/blob-interface.js";
 import type SAttachment from "./sattachment.js";
 import type SAttribute from "./sattribute.js";
 import type SBranch from "./sbranch.js";
-import type { SNoteRow } from "@triliumnext/commons";
+import type { SNoteRow } from "./rows.js";
 
 const LABEL = "label";
 const RELATION = "relation";
diff --git a/apps/server/src/share/shaca/shaca_loader.ts b/apps/server/src/share/shaca/shaca_loader.ts
index 8357c975b..c0834cb8b 100644
--- a/apps/server/src/share/shaca/shaca_loader.ts
+++ b/apps/server/src/share/shaca/shaca_loader.ts
@@ -9,7 +9,7 @@ import SAttribute from "./entities/sattribute.js";
 import SAttachment from "./entities/sattachment.js";
 import shareRoot from "../share_root.js";
 import eventService from "../../services/events.js";
-import type { SAttachmentRow, SAttributeRow, SBranchRow, SNoteRow } from "@triliumnext/commons";
+import type { SAttachmentRow, SAttributeRow, SBranchRow, SNoteRow } from "./entities/rows.js";
 
 function load() {
     const start = Date.now();