diff --git a/machines/geo01/_configuration.nix b/machines/geo01/_configuration.nix
index a402b3f..eb8c564 100644
--- a/machines/geo01/_configuration.nix
+++ b/machines/geo01/_configuration.nix
@@ -11,6 +11,8 @@ lib.extra.mkConfig {
 
   extraConfig = {
     services.netbird.enable = true;
+
+    dgn-hardware.useBcachefs = true;
   };
 
   root = ./.;
diff --git a/machines/geo01/_hardware-configuration.nix b/machines/geo01/_hardware-configuration.nix
index 92ced5d..4fc5d72 100644
--- a/machines/geo01/_hardware-configuration.nix
+++ b/machines/geo01/_hardware-configuration.nix
@@ -1,7 +1,7 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ lib, modulesPath, ... }:
+{ modulesPath, ... }:
 
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
@@ -32,6 +32,4 @@
   };
 
   swapDevices = [ { device = "/dev/disk/by-uuid/dd12c644-ead3-4367-9198-2f7740908633"; } ];
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }
diff --git a/machines/geo02/_configuration.nix b/machines/geo02/_configuration.nix
index a402b3f..eb8c564 100644
--- a/machines/geo02/_configuration.nix
+++ b/machines/geo02/_configuration.nix
@@ -11,6 +11,8 @@ lib.extra.mkConfig {
 
   extraConfig = {
     services.netbird.enable = true;
+
+    dgn-hardware.useBcachefs = true;
   };
 
   root = ./.;
diff --git a/machines/geo02/_hardware-configuration.nix b/machines/geo02/_hardware-configuration.nix
index 0e1aadd..a8cd29b 100644
--- a/machines/geo02/_hardware-configuration.nix
+++ b/machines/geo02/_hardware-configuration.nix
@@ -1,7 +1,7 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ lib, modulesPath, ... }:
+{ modulesPath, ... }:
 
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
@@ -32,6 +32,4 @@
   };
 
   swapDevices = [ { device = "/dev/disk/by-uuid/34db637d-5416-4ae1-98ef-3b0c5672159c"; } ];
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }
diff --git a/machines/vault01/_hardware-configuration.nix b/machines/vault01/_hardware-configuration.nix
index 325e600..27534bf 100644
--- a/machines/vault01/_hardware-configuration.nix
+++ b/machines/vault01/_hardware-configuration.nix
@@ -1,7 +1,7 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ pkgs, modulesPath, ... }:
+{ modulesPath, ... }:
 
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
@@ -21,7 +21,6 @@
 
     kernelModules = [ "kvm-amd" ];
     extraModulePackages = [ ];
-    kernelPackages = pkgs.linuxKernel.packages.linux_6_7;
   };
 
   fileSystems = {
diff --git a/modules/dgn-hardware.nix b/modules/dgn-hardware.nix
index 4110489..54cf458 100644
--- a/modules/dgn-hardware.nix
+++ b/modules/dgn-hardware.nix
@@ -58,7 +58,10 @@ in
         };
       })
 
-      (mkIf cfg.useBcachefs { boot.supportedFilesystems = [ "bcachefs" ]; })
+      (mkIf cfg.useBcachefs {
+        boot.supportedFilesystems = [ "bcachefs" ];
+        boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_7;
+      })
 
       (mkIf cfg.useZfs {
         boot = {