diff --git a/modules/nixos/system/hardware/bluetooth/default.nix b/modules/nixos/system/hardware/bluetooth/default.nix
index c74723b..3b75599 100644
--- a/modules/nixos/system/hardware/bluetooth/default.nix
+++ b/modules/nixos/system/hardware/bluetooth/default.nix
@@ -17,12 +17,14 @@ in {
     hardware.bluetooth = {
       enable = true;
       powerOnBoot = true;
+      settings = {
+        General = {
+          Experimental = true;
+          KernelExperimental = true;
+        };
+      };
     };
 
-    fileSystems."/var/lib/bluetooth" = {
-      device = "/persist/var/lib/bluetooth";
-      options = ["bind" "noauto" "x-systemd.automount"];
-      noCheck = true;
-    };
+    # https://github.com/NixOS/nixpkgs/issues/170573
   };
 }
diff --git a/systems/x86_64-linux/yggdrasil/hardware.nix b/systems/x86_64-linux/yggdrasil/hardware.nix
index 98f60d7..ecec3d3 100644
--- a/systems/x86_64-linux/yggdrasil/hardware.nix
+++ b/systems/x86_64-linux/yggdrasil/hardware.nix
@@ -12,7 +12,7 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
+  boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "sd_mod"];
   boot.initrd.kernelModules = [];
   boot.kernelModules = ["kvm-amd"];
   boot.extraModulePackages = [];
@@ -27,6 +27,12 @@
     fsType = "vfat";
   };
 
+  fileSystems."/var/lib/bluetooth" = {
+    device = "/persist/var/lib/bluetooth";
+    options = ["bind" "noauto" "x-systemd.automount"];
+    noCheck = true;
+  };
+
   swapDevices = [];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking