diff --git a/hosts/op5p/configuration.nix b/hosts/op5p/configuration.nix
index 6867ef9..0c56cbc 100644
--- a/hosts/op5p/configuration.nix
+++ b/hosts/op5p/configuration.nix
@@ -16,6 +16,8 @@
     };
   };
 
+  boot.supportedFilesystems = ["bcachefs"];
+
   security.sudo = {
     enable = true;
     wheelNeedsPassword = false;
diff --git a/hosts/vm/configuration.nix b/hosts/vm/configuration.nix
index 10270fe..7c8cb32 100644
--- a/hosts/vm/configuration.nix
+++ b/hosts/vm/configuration.nix
@@ -20,7 +20,10 @@
     };
   };
 
-  boot.loader.systemd-boot.enable = true;
+  boot = {
+    loader.systemd-boot.enable = true;
+    supportedFilesystems = ["bcachefs"];
+  };
 
   isoImage = {
     isoName = "toolshed-${self.lastModifiedDate}.iso";
diff --git a/modules/base/default.nix b/modules/base/default.nix
index ed5d7db..3783610 100644
--- a/modules/base/default.nix
+++ b/modules/base/default.nix
@@ -35,11 +35,14 @@ in {
   };
 
   config = {
-    # https://github.com/NixOS/nixpkgs/issues/83694#issuecomment-605657381
-    boot.kernel.sysctl."kernel.sysrq" = "438";
-    nixpkgs.config.allowUnfree = true;
+    boot = {
+      # https://github.com/NixOS/nixpkgs/issues/83694#issuecomment-605657381
+      kernel.sysctl."kernel.sysrq" = "438";
 
-    boot.kernelPackages = lib.mkDefault pkgs.zfs.latestCompatibleLinuxPackages;
+      kernelPackages = lib.mkDefault pkgs.zfs.latestCompatibleLinuxPackages;
+    };
+
+    nixpkgs.config.allowUnfree = true;
 
     hardware.enableRedistributableFirmware = true;