diff --git a/flake.lock b/flake.lock
index 600178a..1ca1f01 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,43 +1,6 @@
 {
   "nodes": {
     "disko": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1750903843,
-        "narHash": "sha256-Ng9+f0H5/dW+mq/XOKvB9uwvGbsuiiO6HrPdAcVglCs=",
-        "owner": "nix-community",
-        "repo": "disko",
-        "rev": "83c4da299c1d7d300f8c6fd3a72ac46cb0d59aae",
-        "type": "github"
-      },
-      "original": {
-        "id": "disko",
-        "type": "indirect"
-      }
-    },
-    "disko-stable-nixos": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs-stable-nixos"
-        ]
-      },
-      "locked": {
-        "lastModified": 1750903843,
-        "narHash": "sha256-Ng9+f0H5/dW+mq/XOKvB9uwvGbsuiiO6HrPdAcVglCs=",
-        "owner": "nix-community",
-        "repo": "disko",
-        "rev": "83c4da299c1d7d300f8c6fd3a72ac46cb0d59aae",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "disko",
-        "type": "github"
-      }
-    },
-    "disko_2": {
       "inputs": {
         "nixpkgs": [
           "nixverse",
@@ -60,6 +23,26 @@
         "type": "github"
       }
     },
+    "disko-stable-nixos": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs-stable-nixos"
+        ]
+      },
+      "locked": {
+        "lastModified": 1750903843,
+        "narHash": "sha256-Ng9+f0H5/dW+mq/XOKvB9uwvGbsuiiO6HrPdAcVglCs=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "83c4da299c1d7d300f8c6fd3a72ac46cb0d59aae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -105,7 +88,7 @@
     },
     "nixos-anywhere": {
       "inputs": {
-        "disko": "disko_2",
+        "disko": "disko",
         "flake-parts": "flake-parts",
         "nixos-images": "nixos-images",
         "nixos-stable": "nixos-stable",
@@ -183,10 +166,8 @@
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
+        "id": "nixpkgs",
+        "type": "indirect"
       }
     },
     "nixpkgs-stable-nixos": {
@@ -205,20 +186,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1750994206,
-        "narHash": "sha256-3u6rEbIX9CN/5A5/mc3u0wIO1geZ0EhjvPBXmRDHqWM=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "80d50fc87924c2a0d346372d242c27973cf8cdbf",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
     "nixverse": {
       "inputs": {
         "nix-darwin": "nix-darwin",
@@ -243,9 +210,8 @@
     },
     "root": {
       "inputs": {
-        "disko": "disko",
         "disko-stable-nixos": "disko-stable-nixos",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "nixpkgs-stable-nixos": "nixpkgs-stable-nixos",
         "nixverse": "nixverse"
       }
diff --git a/flake.nix b/flake.nix
index aecba53..00d2520 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,7 +17,6 @@
     {
       self,
       nixpkgs,
-      disko,
       nixverse,
       ...
     }:
diff --git a/nodes/lappy/configuration.nix b/nodes/lappy/configuration.nix
index 18a05fb..355007f 100644
--- a/nodes/lappy/configuration.nix
+++ b/nodes/lappy/configuration.nix
@@ -2,13 +2,13 @@
 # your system. Help is available in the configuration.nix(5) man page, on
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
 
-{ config, lib, pkgs, inputs, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      ./disko.nix
+      ./filesystems.nix
     ];
 
   # Use the systemd-boot EFI boot loader.
diff --git a/nodes/lappy/filesystems.nix b/nodes/lappy/filesystems.nix
new file mode 100644
index 0000000..e47cf1c
--- /dev/null
+++ b/nodes/lappy/filesystems.nix
@@ -0,0 +1,41 @@
+{ ... }: {
+  
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/830e6948-9661-47b2-968d-e939b4bb83b1";
+      fsType = "btrfs";
+      options = [ "subvol=root" "compress=zstd" "noatime" ];
+    };
+
+  fileSystems."/nix" =
+    { device = "/dev/disk/by-uuid/830e6948-9661-47b2-968d-e939b4bb83b1";
+      fsType = "btrfs";
+      options = [ "subvol=nix" "compress=zstd" "noatime" ];
+    };
+
+  fileSystems."/var/log" =
+    { device = "/dev/disk/by-uuid/830e6948-9661-47b2-968d-e939b4bb83b1";
+      fsType = "btrfs";
+      options = [ "subvol=log" "compress=zstd" "noatime" ];
+      neededForBoot = true;
+    };
+
+  fileSystems."/nix/persist" =
+    { device = "/dev/disk/by-uuid/830e6948-9661-47b2-968d-e939b4bb83b1";
+      fsType = "btrfs";
+      options = [ "subvol=persist" "compress=zstd" "noatime" ];
+      neededForBoot = true;
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/60CE-EFBA";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  swapDevices = [{
+    device = "/swapfile";
+    size = 16 * 1024;
+  }];
+
+}
+