diff --git a/flake.nix b/flake.nix
index e54eed1..a9e7539 100644
--- a/flake.nix
+++ b/flake.nix
@@ -227,49 +227,7 @@
       };
     };
     
-    piSystems = {
-      pi4 = inputs.nixos-raspberrypi.lib.nixosSystem {
-        specialArgs = inputs // {
-          # Add any special args you need
-        };
-        system = "aarch64-linux";
-        modules = [
-          # Import your Snowfall modules manually
-          ./systems/aarch64-linux/pi4
-          inputs.disko.nixosModules.disko
-          ./systems/aarch64-linux/pi4/disko.nix
-          inputs.nixos-hardware.nixosModules.raspberry-pi-4
-          {
-            imports = with inputs.nixos-raspberrypi.nixosModules; [
-              raspberry-pi-4.base
-              raspberry-pi-4.display-vc4
-              raspberry-pi-4.bluetooth
-              raspberry-pi-4.case-argonone
-            ];
-          }
-          inputs.impermanence.nixosModules.impermanence
-          inputs.sops-nix.nixosModules.sops
-          inputs.home-manager.nixosModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.backupFileExtension = "backup";
-            home-manager.extraSpecialArgs = { inherit inputs; };
-            home-manager.sharedModules = [
-              inputs.sops-nix.homeManagerModules.sops
-            ];
-            home-manager.users.matt = import (./homes/aarch64-linux + "/matt@pi4/default.nix");
-            home-manager.users.root = { ... }: {
-              imports = [
-                # Your root user config
-                inputs.sops-nix.homeManagerModules.sops
-              ];
-              home.stateVersion = "23.11";
-            };
-          }
-        ];
-      };
-    };
+    piSystems = import ./systems/aarch64-linux/pi4/flake.nix { inherit inputs; };
   in
     snowfall // {
       nixosConfigurations = snowfall.nixosConfigurations // piSystems;
diff --git a/systems/aarch64-linux/pi4/flake.nix b/systems/aarch64-linux/pi4/flake.nix
new file mode 100644
index 0000000..1d5de51
--- /dev/null
+++ b/systems/aarch64-linux/pi4/flake.nix
@@ -0,0 +1,45 @@
+{ inputs }:
+with inputs;
+{
+  pi4 = nixos-raspberrypi.lib.nixosSystem {
+    specialArgs = inputs // {
+      # Add any special args you need
+    };
+    system = "aarch64-linux";
+    modules = [
+      # Import your Snowfall modules manually
+      ./default.nix
+      disko.nixosModules.disko
+      ./disko.nix
+      nixos-hardware.nixosModules.raspberry-pi-4
+      {
+        imports = with nixos-raspberrypi.nixosModules; [
+          raspberry-pi-4.base
+          raspberry-pi-4.display-vc4
+          raspberry-pi-4.bluetooth
+          raspberry-pi-4.case-argonone
+        ];
+      }
+      impermanence.nixosModules.impermanence
+      sops-nix.nixosModules.sops
+      home-manager.nixosModules.home-manager
+      {
+        home-manager.useGlobalPkgs = true;
+        home-manager.useUserPackages = true;
+        home-manager.backupFileExtension = "backup";
+        home-manager.extraSpecialArgs = { inherit inputs; };
+        home-manager.sharedModules = [
+          sops-nix.homeManagerModules.sops
+        ];
+        home-manager.users.matt = import (../../../homes/aarch64-linux + "/matt@pi4/default.nix");
+        home-manager.users.root = { ... }: {
+          imports = [
+            # Your root user config
+            sops-nix.homeManagerModules.sops
+          ];
+          home.stateVersion = "23.11";
+        };
+      }
+    ];
+  };
+}
\ No newline at end of file