diff --git a/modules/eval-docs.nix b/modules/clan/eval-docs.nix
similarity index 65%
rename from modules/eval-docs.nix
rename to modules/clan/eval-docs.nix
index a4016f6dc..68360723e 100644
--- a/modules/eval-docs.nix
+++ b/modules/clan/eval-docs.nix
@@ -1,19 +1,20 @@
 {
   pkgs,
   lib,
-  clan-core,
+  clanModule,
+  clanLib,
 }:
 let
   eval = lib.evalModules {
     modules = [
-      clan-core.modules.clan.default
+      clanModule
     ];
   };
 
   evalDocs = pkgs.nixosOptionsDoc {
     options = eval.options;
     warningsAreErrors = false;
-    transformOptions = clan-core.clanLib.docs.stripStorePathsFromDeclarations;
+    transformOptions = clanLib.docs.stripStorePathsFromDeclarations;
   };
 in
 {
diff --git a/modules/clan/flake-module.nix b/modules/clan/flake-module.nix
index 418f5303d..a84dc554f 100644
--- a/modules/clan/flake-module.nix
+++ b/modules/clan/flake-module.nix
@@ -1,4 +1,26 @@
 { self, lib, ... }:
+let
+  clanModule = lib.modules.importApply ./default.nix { clan-core = self; };
+in
 {
-  flake.modules.clan.default = lib.modules.importApply ./default.nix { clan-core = self; };
+  flake.modules.clan.default = clanModule;
+  perSystem =
+    {
+      pkgs,
+      lib,
+      ...
+    }:
+    let
+      jsonDocs = import ./eval-docs.nix {
+        inherit
+          pkgs
+          lib
+          clanModule
+          ;
+        clanLib = self.clanLib;
+      };
+    in
+    {
+      legacyPackages.clan-options = jsonDocs.optionsJSON;
+    };
 }
diff --git a/modules/flake-module.nix b/modules/flake-module.nix
index 2911f3c27..d050333e4 100644
--- a/modules/flake-module.nix
+++ b/modules/flake-module.nix
@@ -1,24 +1,5 @@
-{
-  self,
-  ...
-}:
 {
   imports = [
     ./clan/flake-module.nix
   ];
-  perSystem =
-    {
-      pkgs,
-      lib,
-      ...
-    }:
-    let
-      jsonDocs = import ./eval-docs.nix {
-        inherit pkgs lib;
-        clan-core = self;
-      };
-    in
-    {
-      legacyPackages.clan-options = jsonDocs.optionsJSON;
-    };
 }