diff --git a/flake.nix b/flake.nix
index 37e00c6..fcd6054 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,10 +17,6 @@
     supportedSystems = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
     colmenaOptions = import ./src/nix/hive/options.nix;
     colmenaModules = import ./src/nix/hive/modules.nix;
-    evalNix = import ./src/nix/hive/eval.nix {
-      hermetic = true;
-      inherit colmenaOptions colmenaModules;
-    };
   in utils.lib.eachSystem supportedSystems (system: let
     pkgs = import nixpkgs {
       inherit system;
@@ -86,7 +82,10 @@
     overlay = final: prev: {
       colmena = final.callPackage ./package.nix { };
     };
-    inherit (evalNix) nixosModules;
+    nixosModules = {
+        inherit (colmenaOptions) deploymentOptions metaOptions;
+        inherit (colmenaModules) keyChownModule keyServiceModule;
+    };
   };
 
   nixConfig = {
diff --git a/src/nix/hive/eval.nix b/src/nix/hive/eval.nix
index d859c79..fd3e44c 100644
--- a/src/nix/hive/eval.nix
+++ b/src/nix/hive/eval.nix
@@ -211,6 +211,4 @@ in {
     metaConfig;
 
   meta = hive.meta;
-
-  nixosModules = { inherit (colmenaOptions) deploymentOptions; };
 }