diff --git a/flake.lock b/flake.lock
index 7f67537..90720ea 100644
--- a/flake.lock
+++ b/flake.lock
@@ -216,25 +216,6 @@
         "type": "github"
       }
     },
-    "disko_2": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1776116592,
-        "narHash": "sha256-9mDPGkqhB5UGHzF+A+yCq8dLOhUPV2e632pISgr5W9Q=",
-        "owner": "matthewcroughan",
-        "repo": "disko",
-        "rev": "d4674d4f49a65f9fcc4e1fc54cf251fd1095bf5f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "matthewcroughan",
-        "ref": "test-nouefi",
-        "repo": "disko",
-        "type": "github"
-      }
-    },
     "dmerge": {
       "inputs": {
         "haumea": [
@@ -310,24 +291,6 @@
         "type": "github"
       }
     },
-    "flake-parts_3": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
-      },
-      "locked": {
-        "lastModified": 1778716662,
-        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "inputs": {
         "systems": "systems_2"
@@ -536,9 +499,16 @@
     },
     "matthew-hardware": {
       "inputs": {
-        "disko": "disko_2",
-        "flake-parts": "flake-parts_3",
-        "nixpkgs": "nixpkgs_3",
+        "disko": [
+          "clan-core",
+          "disko"
+        ],
+        "flake-parts": [
+          "flake-parts"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "unf": "unf"
       },
       "locked": {
@@ -764,54 +734,7 @@
         "type": "github"
       }
     },
-    "nixpkgs-lib": {
-      "locked": {
-        "lastModified": 1777168982,
-        "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1773628058,
-        "narHash": "sha256-hpXH0z3K9xv0fHaje136KY872VT2T5uwxtezlAskQgY=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "f8573b9c935cfaa162dd62cc9e75ae2db86f85df",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1780243769,
-        "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
       "locked": {
         "lastModified": 1780365719,
         "narHash": "sha256-QfWfccTN+70ZQ4m2qlU9PiKfz2Yppq94058iJyARNwc=",
@@ -827,7 +750,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1781359544,
         "narHash": "sha256-iUuzKQcyXvopYDDzFpMK5eQKP3WIJExYny2kJtbgUcE=",
@@ -940,7 +863,7 @@
         "liminix": "liminix",
         "matthew-hardware": "matthew-hardware",
         "nixos-images": "nixos-images",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_3",
         "plasma-manager": "plasma-manager",
         "treefmt-nix": "treefmt-nix"
       }
@@ -1110,7 +1033,7 @@
     },
     "unf": {
       "inputs": {
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "lastModified": 1779596435,
diff --git a/flake.nix b/flake.nix
index 4d2edd4..23542f8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -54,6 +54,9 @@
 
     matthew-hardware = {
       url = "git+https://codeberg.org/matthewcroughan/matthew-hardware?ref=mc/wip";
+      inputs.flake-parts.follows = "flake-parts";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.disko.follows = "clan-core/disko";
     };
   };
   outputs =
diff --git a/machines/stellio/configuration.nix b/machines/stellio/configuration.nix
index 4f96828..94ae6fd 100644
--- a/machines/stellio/configuration.nix
+++ b/machines/stellio/configuration.nix
@@ -1,5 +1,7 @@
-{ ... }:
+{ inputs, ... }:
 {
+  imports = [ inputs.matthew-hardware];
+
   nixpkgs.hostPlatform = {
     system = "aarch64-linux";
   };