diff --git a/flake.lock b/flake.lock
index 6e45d94..f076fab 100644
--- a/flake.lock
+++ b/flake.lock
@@ -318,11 +318,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767024057,
-        "narHash": "sha256-B1aycRjMRvb6QOGbnqDhiDzZwMebj5jxZ5qyJzaKvpI=",
+        "lastModified": 1767619900,
+        "narHash": "sha256-KpoCBPvwHz3gAQtIUkohE2InRBFK3r0/FM6z5SPWfvM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "34578a2fdfce4257ce5f5baf6e7efbd4e4e252b1",
+        "rev": "6bd04da47cfb48dfd15eabf08364b78ad894f5b2",
         "type": "github"
       },
       "original": {
@@ -464,11 +464,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1766568855,
-        "narHash": "sha256-UXVtN77D7pzKmzOotFTStgZBqpOcf8cO95FcupWp4Zo=",
+        "lastModified": 1767185284,
+        "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "c5db9569ac9cc70929c268ac461f4003e3e5ca80",
+        "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe",
         "type": "github"
       },
       "original": {
@@ -518,11 +518,11 @@
     },
     "nixpkgs-old-kernel": {
       "locked": {
-        "lastModified": 1766687554,
-        "narHash": "sha256-DegN7KD/EtFSKXf2jvqL6lvev6GlfAAatYBcRC8goEo=",
+        "lastModified": 1767051569,
+        "narHash": "sha256-0MnuWoN+n1UYaGBIpqpPs9I9ZHW4kynits4mrnh1Pk4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fd0ca39c92fdb4012ed8d60e1683c26fddadd136",
+        "rev": "40ee5e1944bebdd128f9fbada44faefddfde29bd",
         "type": "github"
       },
       "original": {
@@ -534,11 +534,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1766885793,
-        "narHash": "sha256-P6RVkrM9JLCW6xBjSwHfgTOQ1JwBUma5xe5LI8xAPC0=",
+        "lastModified": 1767480499,
+        "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9ef261221d1e72399f2036786498d78c38185c46",
+        "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92",
         "type": "github"
       },
       "original": {
diff --git a/installer/artifacts.nix b/installer/artifacts.nix
index c862a21..3e835b6 100644
--- a/installer/artifacts.nix
+++ b/installer/artifacts.nix
@@ -18,14 +18,8 @@ let
     hostName:
     let
       targetConfig = self.nixosConfigurations.${hostName}.config;
-      targetSystem = targetConfig.system.build.toplevel;
+      targetSystemBuild = targetConfig.system.build;
       diskoScript = targetConfig.system.build.diskoScript;
-      
-      # Build the closure export at build time (not runtime in ISO)
-      closureExport = pkgs.runCommand "closure-export-${hostName}" { } ''
-        mkdir -p $out
-        ${pkgs.nix}/bin/nix-store --export $(${pkgs.nix}/bin/nix-store -qR ${targetSystem}) > $out/closure.nar
-      '';
     in
     nixpkgs.lib.nixosSystem {
       inherit system;
@@ -33,9 +27,8 @@ let
         inherit
           inputs
           hostName
-          targetSystem
+          targetSystemBuild
           diskoScript
-          closureExport
           ;
         hostPlatform = system;
       };
diff --git a/installer/auto-install.nix b/installer/auto-install.nix
index 63d0ef1..3a3b792 100644
--- a/installer/auto-install.nix
+++ b/installer/auto-install.nix
@@ -1,7 +1,6 @@
 # This module defines a systemd service that automatically installs NixOS to the disk.
 # It is intended to be used in an installation ISO.
-# It expects `targetSystem` (the closure to install), `diskoScript` (the partitioning script),
-# and `closureExport` (the pre-built NAR archive) to be passed as arguments.
+# It expects `targetSystem` (the closure to install) and `diskoScript` (the partitioning script) to be passed as arguments.
 {
   config,
   lib,
@@ -9,34 +8,26 @@
   inputs,
   hostName,
   hostPlatform,
-  targetSystem,
+  targetSystemBuild,
   diskoScript,
-  closureExport,
   ...
 }:
 {
-  # Ensure the entire system closure and all dependencies are included in the ISO
   environment.systemPackages = [
     pkgs.git
     pkgs.bashInteractive
     pkgs.curl
-    targetSystem
-  ];
-
-  # Explicitly include the pre-built closure export and system in the ISO image
-  isoImage.contents = [
-    {
-      source = closureExport;
-      target = "/closure-export";
-    }
-    {
-      source = targetSystem;
-      target = "/system";
-    }
+    targetSystemBuild.toplevel
   ];
 
   nixpkgs.hostPlatform = hostPlatform;
 
+  nix.settings.experimental-features = "nix-command flakes";
+
+  system.extraDependencies = with targetSystemBuild; [ toplevel etc bootStage2 ];
+
+  isoImage.storeContents = [ targetSystemBuild.toplevel ];
+
   systemd.services.auto-install = {
     description = "Automatic NixOS install for ${hostName}";
     after = [
@@ -59,17 +50,12 @@
       echo ">>> Running disko script..."
       ${diskoScript}
 
-      echo ">>> Importing pre-built closure into target store..."
-      # Import the closure that was exported at build time
-      ${pkgs.nix}/bin/nix-store --store /mnt --import < /closure-export/closure.nar > /dev/null
-
-      echo ">>> Running nixos-install..."
-      # Install with pre-built closure already imported (no evaluation or fetching needed)
-      ${pkgs.nix}/bin/nixos-install \
-        --no-root-passwd \
-        --root /mnt \
-        --system ${targetSystem} \
-        --option substitute false
+      echo ">>> Setting up NixOS..."
+      nixos-install \
+      --system ${targetSystemBuild.toplevel} \
+      --no-root-passwd \
+      --no-channel-copy \
+      --substituters "" 
 
       echo ">>> Done. Rebooting."
       systemctl reboot