diff --git a/systems/x86_64-linux/gospel/default.nix b/systems/x86_64-linux/gospel/default.nix
index c82bc86..01da188 100644
--- a/systems/x86_64-linux/gospel/default.nix
+++ b/systems/x86_64-linux/gospel/default.nix
@@ -6,7 +6,6 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ./zfs.nix
   ];
 
   age.secrets.cf_dns_kilonull.file = ../../../secrets/cf_dns_kilonull.age;
@@ -119,6 +118,9 @@
 
   programs.virt-manager.enable = true;
 
+  boot.loader.systemd-boot.enable = true;
+  boot.supportedFilesystems = [ "bcachefs" ];
+  boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.binfmt.emulatedSystems = [
     "aarch64-linux"
     "armv6l-linux"
diff --git a/systems/x86_64-linux/gospel/hardware-configuration.nix b/systems/x86_64-linux/gospel/hardware-configuration.nix
index 79c23b5..ea358c9 100644
--- a/systems/x86_64-linux/gospel/hardware-configuration.nix
+++ b/systems/x86_64-linux/gospel/hardware-configuration.nix
@@ -24,44 +24,13 @@
   boot.kernelModules = [ "kvm-intel" ];
 
   fileSystems."/" = {
-    device = "rpool/nixos/root";
-    fsType = "zfs";
-    options = [
-      "zfsutil"
-      "X-mount.mkdir"
-    ];
-  };
-
-  fileSystems."/home" = {
-    device = "rpool/nixos/home";
-    fsType = "zfs";
-    options = [
-      "zfsutil"
-      "X-mount.mkdir"
-    ];
-  };
-
-  fileSystems."/var/lib" = {
-    device = "rpool/nixos/var/lib";
-    fsType = "zfs";
-    options = [
-      "zfsutil"
-      "X-mount.mkdir"
-    ];
-  };
-
-  fileSystems."/var/log" = {
-    device = "rpool/nixos/var/log";
-    fsType = "zfs";
-    options = [
-      "zfsutil"
-      "X-mount.mkdir"
-    ];
+    device = "nixos";
+    fsType = "bcachefs";
   };
 
   fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/3C7C-03C4";
-    fsType = "vfat";
+    fsType = "fat32";
   };
 
   swapDevices = [ ];
diff --git a/systems/x86_64-linux/gospel/zfs.nix b/systems/x86_64-linux/gospel/zfs.nix
deleted file mode 100644
index 4384762..0000000
--- a/systems/x86_64-linux/gospel/zfs.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ ... }:
-{
-  boot.supportedFilesystems = [ "zfs" ];
-  networking.hostId = "f8616592";
-  boot.loader.efi.canTouchEfiVariables = false;
-  boot.loader.systemd-boot.enable = true;
-  users.users.root.initialHashedPassword = "$6$3Ps2Vmff.gUBkiCv$FCeCQjDvNTdWynQU81qtCXFHQht86w4unWNalUgkcyq7lkkI2klzRyTK3dZiQUjIrn8qPKtwJcY9SNdyE8v1L/";
-}