diff --git a/flake.nix b/flake.nix
index 07f5f80..29f5b63 100644
--- a/flake.nix
+++ b/flake.nix
@@ -38,30 +38,18 @@
             ];
           };
 
-          packages =
-            let
-              darwinConfigs = lib.filterAttrs (
-                _: config: config.eval.config.nixpkgs.system == system
-              ) inputs.self.darwinConfigurations;
-              # Force garnix to build the config
-              darwinConfigs' = lib.mapAttrs' (name: config: {
-                name = "__darwinConfigurations_${name}";
-                value = config.system;
-              }) darwinConfigs;
-            in
-            {
-              # Re-export it for convenience and for caching
-              inherit (inputs'.attic.packages) attic-client attic-server;
-              base-packages = pkgs.symlinkJoin {
-                name = "settei-base";
-                paths = with self'.packages; [
-                  helix
-                  fish
-                  git-commit-last
-                ];
-              };
-            }
-            // darwinConfigs';
+          packages = {
+            # Re-export it for convenience and for caching
+            inherit (inputs'.attic.packages) attic-client attic-server;
+            base-packages = pkgs.symlinkJoin {
+              name = "settei-base";
+              paths = with self'.packages; [
+                helix
+                fish
+                git-commit-last
+              ];
+            };
+          };
 
           formatter = pkgs.nixfmt-rfc-style;
         };
diff --git a/hosts/default.nix b/hosts/default.nix
index 1f1ab38..3f2395c 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -66,15 +66,9 @@
 
       darwin =
         name: module:
-        let
-          eval = baseDarwin._module.args.extendModules {
-            modules = [ module ];
-            specialArgs.configurationName = name;
-          };
-        in
-        {
-          system = eval.config.system.build.toplevel;
-          inherit eval;
+        baseDarwin._module.args.extendModules {
+          modules = [ module ];
+          specialArgs.configurationName = name;
         };
     };
 }