diff --git a/hosts/envoy/fs.nix b/hosts/envoy/fs.nix
index 5b26a6d..96bf92f 100644
--- a/hosts/envoy/fs.nix
+++ b/hosts/envoy/fs.nix
@@ -10,18 +10,18 @@ in {
       main = {
         type = "disk";
         device = "/dev/disk/by-id/${disks.main}";
-        content = with lib.disko.gpt; {
+        content = {
           type = "gpt";
           partitions = {
-            grub = partGrub;
-            bios = partBoot "512M";
-            rpool = partLuksZfs disks.main "rpool" "100%";
+            grub = lib.disko.gpt.partGrub;
+            bios = lib.disko.gpt.partBoot "512M";
+            rpool = lib.disko.gpt.partLuksZfs disks.main "rpool" "100%";
           };
         };
       };
     };
-    zpool = with lib.disko.zfs; {
-      rpool = mkZpool {datasets = impermanenceZfsDatasets;};
+    zpool = {
+      rpool = lib.disko.zfs.mkZpool {datasets = lib.disko.zfs.impermanenceZfsDatasets;};
     };
   };
 
diff --git a/hosts/kroma/fs.nix b/hosts/kroma/fs.nix
index d801358..2895476 100644
--- a/hosts/kroma/fs.nix
+++ b/hosts/kroma/fs.nix
@@ -10,18 +10,18 @@ in {
       m2-ssd = {
         type = "disk";
         device = "/dev/disk/by-id/${disks.m2-ssd}";
-        content = with lib.disko.gpt; {
+        content = {
           type = "gpt";
           partitions = {
-            efi = partEfi "1G";
-            swap = partSwap "16G";
-            rpool = partLuksZfs disks.m2-ssd "rpool" "100%";
+            efi = lib.disko.gpt.partEfi "1G";
+            swap = lib.disko.gpt.partSwap "16G";
+            rpool = lib.disko.gpt.partLuksZfs disks.m2-ssd "rpool" "100%";
           };
         };
       };
     };
-    zpool = with lib.disko.zfs; {
-      rpool = mkZpool {datasets = impermanenceZfsDatasets;};
+    zpool = {
+      rpool = lib.disko.zfs.mkZpool {datasets = lib.disko.zfs.impermanenceZfsDatasets;};
     };
   };
 }
diff --git a/hosts/nom/fs.nix b/hosts/nom/fs.nix
index fd6469e..2db46e8 100644
--- a/hosts/nom/fs.nix
+++ b/hosts/nom/fs.nix
@@ -10,27 +10,27 @@ in {
       m2-ssd = {
         type = "disk";
         device = "/dev/disk/by-id/${disks.m2-ssd}";
-        content = with lib.disko.gpt; {
+        content = {
           type = "gpt";
           partitions = {
-            rpool = partLuksZfs disks.m2-ssd "rpool" "100%";
+            rpool = lib.disko.gpt.partLuksZfs disks.m2-ssd "rpool" "100%";
           };
         };
       };
       boot-ssd = {
         type = "disk";
         device = "/dev/disk/by-id/${disks.boot-ssd}";
-        content = with lib.disko.gpt; {
+        content = {
           type = "gpt";
           partitions = {
-            efi = partEfi "8G";
-            swap = partSwap "100%";
+            efi = lib.disko.gpt.partEfi "8G";
+            swap = lib.disko.gpt.partSwap "100%";
           };
         };
       };
     };
-    zpool = with lib.disko.zfs; {
-      rpool = mkZpool {datasets = impermanenceZfsDatasets;};
+    zpool = {
+      rpool = lib.disko.zfs.mkZpool {datasets = lib.disko.zfs.impermanenceZfsDatasets;};
     };
   };
 }
diff --git a/hosts/sentinel/fs.nix b/hosts/sentinel/fs.nix
index 5b26a6d..96bf92f 100644
--- a/hosts/sentinel/fs.nix
+++ b/hosts/sentinel/fs.nix
@@ -10,18 +10,18 @@ in {
       main = {
         type = "disk";
         device = "/dev/disk/by-id/${disks.main}";
-        content = with lib.disko.gpt; {
+        content = {
           type = "gpt";
           partitions = {
-            grub = partGrub;
-            bios = partBoot "512M";
-            rpool = partLuksZfs disks.main "rpool" "100%";
+            grub = lib.disko.gpt.partGrub;
+            bios = lib.disko.gpt.partBoot "512M";
+            rpool = lib.disko.gpt.partLuksZfs disks.main "rpool" "100%";
           };
         };
       };
     };
-    zpool = with lib.disko.zfs; {
-      rpool = mkZpool {datasets = impermanenceZfsDatasets;};
+    zpool = {
+      rpool = lib.disko.zfs.mkZpool {datasets = lib.disko.zfs.impermanenceZfsDatasets;};
     };
   };
 
diff --git a/hosts/sire/fs.nix b/hosts/sire/fs.nix
index 2063a8b..5a3c87e 100644
--- a/hosts/sire/fs.nix
+++ b/hosts/sire/fs.nix
@@ -11,11 +11,11 @@ in {
         m2-ssd-1 = {
           type = "disk";
           device = "/dev/disk/by-id/${disks.m2-ssd-1}";
-          content = with lib.disko.gpt; {
+          content = {
             type = "gpt";
             partitions = {
-              efi = partEfi "1G";
-              rpool = partLuksZfs disks.m2-ssd-1 "rpool" "100%";
+              efi = lib.disko.gpt.partEfi "1G";
+              rpool = lib.disko.gpt.partLuksZfs disks.m2-ssd-1 "rpool" "100%";
             };
           };
         };
@@ -30,13 +30,13 @@ in {
         device = "/dev/disk/by-id/${disk}";
         content = lib.disko.content.luksZfs disk "storage";
       });
-    zpool = with lib.disko.zfs; {
-      rpool = mkZpool {
+    zpool = {
+      rpool = lib.disko.zfs.mkZpool {
         mode = "mirror";
         datasets =
-          impermanenceZfsDatasets
+          lib.disko.zfs.impermanenceZfsDatasets
           // {
-            "safe/guests" = unmountable;
+            "safe/guests" = lib.disko.zfs.unmountable;
           };
       };
       storage = mkZpool {
diff --git a/hosts/ward/fs.nix b/hosts/ward/fs.nix
index 66741e8..df6b226 100644
--- a/hosts/ward/fs.nix
+++ b/hosts/ward/fs.nix
@@ -10,22 +10,22 @@ in {
       m2-ssd = {
         type = "disk";
         device = "/dev/disk/by-id/${disks.m2-ssd}";
-        content = with lib.disko.gpt; {
+        content = {
           type = "gpt";
           partitions = {
-            efi = partEfi "1G";
-            swap = partSwap "16G";
-            rpool = partLuksZfs disks.m2-ssd "rpool" "100%";
+            efi = lib.disko.gpt.partEfi "1G";
+            swap = lib.disko.gpt.partSwap "16G";
+            rpool = lib.disko.gpt.partLuksZfs disks.m2-ssd "rpool" "100%";
           };
         };
       };
     };
-    zpool = with lib.disko.zfs; {
-      rpool = mkZpool {
+    zpool = {
+      rpool = lib.disko.zfs.mkZpool {
         datasets =
-          impermanenceZfsDatasets
+          lib.disko.zfs.impermanenceZfsDatasets
           // {
-            "safe/guests" = unmountable;
+            "safe/guests" = lib.disko.zfs.unmountable;
           };
       };
     };
diff --git a/hosts/zackbiene/fs.nix b/hosts/zackbiene/fs.nix
index 196d97d..4ac3c48 100644
--- a/hosts/zackbiene/fs.nix
+++ b/hosts/zackbiene/fs.nix
@@ -10,18 +10,18 @@ in {
       mmc = {
         type = "disk";
         device = "/dev/disk/by-id/${disks.mmc}";
-        content = with lib.disko.gpt; {
+        content = {
           type = "gpt";
           partitions = {
-            efi = partEfi "1G";
-            swap = partSwap "8G";
-            rpool = partLuksZfs disks.mmc "rpool" "100%";
+            efi = lib.disko.gpt.partEfi "1G";
+            swap = lib.disko.gpt.partSwap "8G";
+            rpool = lib.disko.gpt.partLuksZfs disks.mmc "rpool" "100%";
           };
         };
       };
     };
-    zpool = with lib.disko.zfs; {
-      rpool = mkZpool {datasets = impermanenceZfsDatasets;};
+    zpool = {
+      rpool = lib.disko.zfs.mkZpool {datasets = lib.disko.zfs.impermanenceZfsDatasets;};
     };
   };
 }