diff --git a/hosts/bakke/configuration.nix b/hosts/bakke/configuration.nix
index 5d7b5b4..7629f22 100644
--- a/hosts/bakke/configuration.nix
+++ b/hosts/bakke/configuration.nix
@@ -12,14 +12,8 @@
   sops.age.keyFile = "/var/lib/sops-nix/key.txt";
   sops.age.generateKey = true;
 
-  boot.loader = {
-    efi.canTouchEfiVariables = true;
-    grub = {
-      enable = true;
-      efiSupport = true;
-      device = "nodev";
-   };
-  };
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
 
   networking.hostName = "bakke";
   networking.hostId = "99609ffc";
diff --git a/hosts/bakke/disks.nix b/hosts/bakke/disks.nix
index 3420a85..e7d1a5b 100644
--- a/hosts/bakke/disks.nix
+++ b/hosts/bakke/disks.nix
@@ -1,5 +1,6 @@
 {
   # https://github.com/nix-community/disko/blob/master/example/boot-raid1.nix
+  # Note: Disko was used to create the initial md raid, but is no longer in active use on this host.
   disko.devices = {
     disk = {
       one = {
diff --git a/hosts/bakke/filesystems.nix b/hosts/bakke/filesystems.nix
index 5bb1172..9312a0c 100644
--- a/hosts/bakke/filesystems.nix
+++ b/hosts/bakke/filesystems.nix
@@ -1,9 +1,6 @@
 { config, pkgs, lib, ... }:
 {
   # Boot drives:
-  imports = [
-    ./disks.nix
-  ];
   boot.swraid.enable = true;
 
   # ZFS Data pool: