diff --git a/flake.lock b/flake.lock
index 54487c0..46a6adf 100644
--- a/flake.lock
+++ b/flake.lock
@@ -215,11 +215,11 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-SakyZnAhoToQmui5hozmLqkoLw6N/AHCgKF4tCP/sTQ=",
-        "path": "/mnt/nix/store/4y5l241pnwi2qh4wxcfmxlpdnjq8nsac-source/disko",
+        "path": "/mnt/nix/store/6632xfzj8dykclkxzhjbigh06hkvia70-source/disko",
         "type": "path"
       },
       "original": {
-        "path": "/mnt/nix/store/4y5l241pnwi2qh4wxcfmxlpdnjq8nsac-source/disko",
+        "path": "/mnt/nix/store/6632xfzj8dykclkxzhjbigh06hkvia70-source/disko",
         "type": "path"
       }
     },
@@ -1044,11 +1044,11 @@
       "locked": {
         "lastModified": 0,
         "narHash": "sha256-Hz1a2OgtlwgdQhI6hiUvityjVURsoY6oXkXq25RyiBM=",
-        "path": "/mnt/nix/store/x4s89c2jcsnfwqjbj5zcpb233i9x31i0-source/home",
+        "path": "/mnt/nix/store/v3m4p7s1ncm6x2qdbfn8h7816rfidrww-source/home",
         "type": "path"
       },
       "original": {
-        "path": "/mnt/nix/store/x4s89c2jcsnfwqjbj5zcpb233i9x31i0-source/home",
+        "path": "/mnt/nix/store/v3m4p7s1ncm6x2qdbfn8h7816rfidrww-source/home",
         "type": "path"
       }
     },
@@ -1434,11 +1434,11 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-6oCDKhDSqJMWeODXDHD5XorN7/+KXBBIPZ2z+obwUNY=",
-        "path": "/mnt/nix/store/4y5l241pnwi2qh4wxcfmxlpdnjq8nsac-source/packages",
+        "path": "/mnt/nix/store/6632xfzj8dykclkxzhjbigh06hkvia70-source/packages",
         "type": "path"
       },
       "original": {
-        "path": "/mnt/nix/store/4y5l241pnwi2qh4wxcfmxlpdnjq8nsac-source/packages",
+        "path": "/mnt/nix/store/6632xfzj8dykclkxzhjbigh06hkvia70-source/packages",
         "type": "path"
       }
     },
@@ -1524,11 +1524,11 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-hg0wqQn6BxQXLmfBINzZoaWpdSIlwwZxKbYz+4df83o=",
-        "path": "/mnt/nix/store/4y5l241pnwi2qh4wxcfmxlpdnjq8nsac-source/programs",
+        "path": "/mnt/nix/store/6632xfzj8dykclkxzhjbigh06hkvia70-source/programs",
         "type": "path"
       },
       "original": {
-        "path": "/mnt/nix/store/4y5l241pnwi2qh4wxcfmxlpdnjq8nsac-source/programs",
+        "path": "/mnt/nix/store/6632xfzj8dykclkxzhjbigh06hkvia70-source/programs",
         "type": "path"
       }
     },
@@ -1655,11 +1655,11 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-VZKans7CW3BgyWaVgi9mGKvJsCvyse2zLPRB5fJnlfA=",
-        "path": "/mnt/nix/store/4y5l241pnwi2qh4wxcfmxlpdnjq8nsac-source/services",
+        "path": "/mnt/nix/store/6632xfzj8dykclkxzhjbigh06hkvia70-source/services",
         "type": "path"
       },
       "original": {
-        "path": "/mnt/nix/store/4y5l241pnwi2qh4wxcfmxlpdnjq8nsac-source/services",
+        "path": "/mnt/nix/store/6632xfzj8dykclkxzhjbigh06hkvia70-source/services",
         "type": "path"
       }
     },
@@ -1673,12 +1673,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-6D9Qya9I2fNjDLasG/DH3OQwSGoFbMkU7ZpvPEIEPqs=",
-        "path": "/mnt/nix/store/x4s89c2jcsnfwqjbj5zcpb233i9x31i0-source/system",
+        "narHash": "sha256-4o+6OFouADJTS6Q5yawUGFLMoOUX8Mf/zIIlTARisj4=",
+        "path": "/mnt/nix/store/v3m4p7s1ncm6x2qdbfn8h7816rfidrww-source/system",
         "type": "path"
       },
       "original": {
-        "path": "/mnt/nix/store/x4s89c2jcsnfwqjbj5zcpb233i9x31i0-source/system",
+        "path": "/mnt/nix/store/v3m4p7s1ncm6x2qdbfn8h7816rfidrww-source/system",
         "type": "path"
       }
     },
diff --git a/system/disko/flake.nix b/system/disko/flake.nix
deleted file mode 100644
index 4d70ae4..0000000
--- a/system/disko/flake.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    description = "disko config";
-
-    inputs = {
-        nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
-        disko.url = "github:nix-community/disko";
-        disko.inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    outputs = { self, ... }@inputs: {
-
-        module = { config, lib, pkgs, ... }: {
-            imports = [ 
-                (import ./default.nix { inherit config lib pkgs; })
-                inputs.disko.nixosModules.default
-            ];
-        };
-    };
-}
diff --git a/system/flake.nix b/system/flake.nix
index cf9c20f..6ba880e 100755
--- a/system/flake.nix
+++ b/system/flake.nix
@@ -9,7 +9,9 @@
 
         prgms.url = "./programs";
 
-        diskoConfig.url = "./disko";
+        nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
+        disko.url = "github:nix-community/disko";
+        disko.inputs.nixpkgs.follows = "nixpkgs";
 
         impermanence.url = "github:nix-community/impermanence";
 
@@ -21,7 +23,8 @@
             imports = [ 
                 ./configuration
                 ./configuration/${core_inputs.host}/hardware-configuration.nix
-                inputs.diskoConfig.module
+                ./disko
+                inputs.disko.nixosModules.default
                 ./impermanence
                 inputs.impermanence.nixosModules.impermanence
                 inputs.srvcs.module