diff --git a/nixos/boxes/bolty/bolty-boot.nix b/nixos/boxes/bolty/bolty-boot.nix
index bf4dad5c..bc680611 100644
--- a/nixos/boxes/bolty/bolty-boot.nix
+++ b/nixos/boxes/bolty/bolty-boot.nix
@@ -1,6 +1,6 @@
 { config, pkgs, ... }: {
   boot = {
-    kernelPackages = pkgs.linuxPackages_latest;
+    kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
     initrd.availableKernelModules =
       [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_acpi" ];
     initrd.kernelModules = [ "dm-snapshot" ];
@@ -8,9 +8,14 @@
     extraModulePackages = [ ];
     loader.systemd-boot.enable = true;
     loader.efi.canTouchEfiVariables = false;
+    supportedFilesystems = [ "zfs" ];
+    zfs.forceImportRoot = false;
   };
 
   services.btrfs.autoScrub.enable = true;
+  services.zfs.autoScrub.enable = true;
+  boot.kernelParams = [ "zfs.zfs_arc_max=8589934592" ];
+
   fileSystems."/data" = {
     device = "/dev/disk/by-uuid/78e8e5b5-9068-4381-8e85-b4297607f9ea";
     fsType = "btrfs";
diff --git a/nixos/boxes/bolty/default.nix b/nixos/boxes/bolty/default.nix
index 34ac9cdf..0c42ff78 100644
--- a/nixos/boxes/bolty/default.nix
+++ b/nixos/boxes/bolty/default.nix
@@ -20,6 +20,7 @@
   boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
   programs.ccache.enable = true;
   networking.hostName = "bolty";
+  networking.hostId = "f05dd3b4";
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 
   time.timeZone = "Europe/London";
diff --git a/nixos/boxes/bolty/home-security.nix b/nixos/boxes/bolty/home-security.nix
index ad71b1a5..a85bbc7f 100644
--- a/nixos/boxes/bolty/home-security.nix
+++ b/nixos/boxes/bolty/home-security.nix
@@ -1,12 +1,2 @@
 { config, pkgs, inputs, lib, ... }: {
-  services.zoneminder = {
-    enable = true;
-    storageDir = "/data/zoneminder";
-    openFirewall = true;
-    cameras = 5;
-    database = {
-      createLocally = true;
-      username = "zoneminder";
-    };
-  };
 }