diff --git a/flake.nix b/flake.nix
index 796fc21..8968177 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,7 +37,13 @@
           };
           imports = [
             # ./git_system.nix
-            (import ./setup { inherit inputs; })
+            inputs.disko.nixosModules.disko
+            ./setup/disk_conf.nix
+            ./setup/mini_conf.nix
+            {
+              networking.hostId = "0a7337de";
+              boot.loader.grub.zfsSupport = true;
+            }
           ];
         };
       # runner-system =