diff --git a/os-mods/xmr/default.nix b/os-mods/xmr/default.nix
deleted file mode 100644
index 802964d..0000000
--- a/os-mods/xmr/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ config
-, lib
-, pkgs
-, system
-, inputs
-, ...
-}: {
-  services.monero = {
-    enable = true;
-    dataDir = "/media/SanDisk/monero"; # TODO make config option for this and set sensible default
-    limits.upload = 1024;
-  };
-  environment.systemPackages = with pkgs; [
-    monero-gui
-    monero-cli
-    xmrig
-  ];
-}
diff --git a/systems/nixos-desk/default.nix b/systems/nixos-desk/default.nix
index 4d8dd8c..71af689 100644
--- a/systems/nixos-desk/default.nix
+++ b/systems/nixos-desk/default.nix
@@ -23,7 +23,6 @@
     ../../os-mods/netdata
     ../../os-mods/network
     ../../os-mods/virt
-    ../../os-mods/xmr
     ../../users
     ./disko.nix
   ];
@@ -43,12 +42,20 @@
       kernelPackages = pkgs.pkgsx86_64_v3.linuxPackages_cachyos;
       loader = {
         systemd-boot = {
-          enable = true;
+          enable = lib.mkForce false; #lanzaboote
           configurationLimit = 16;
         };
+
         efi.canTouchEfiVariables = true;
       };
 
+      # TODO Extract secureboot module
+      lanzaboote = {
+        enable = true;
+        configurationLimit = 16;
+        pkiBundle = "/etc/secureboot";
+      };
+
       initrd = {
         availableKernelModules = [ "ahci" "nvme" "xhci_pci" "uas" "usbhid" "usb_storage" "sd_mod" ];
         kernelModules = [ ];
@@ -58,6 +65,13 @@
       extraModulePackages = [ ];
     };
 
+    environment.systemPackages = with pkgs; [
+      lm_sensors
+      coreutils-full
+      cpu-x
+      sbctl # secureboot debugging/config/mgmt
+    ];
+
     services.btrfs.autoScrub.enable = true;
 
     networking = {