diff --git a/configuration.nix b/configuration.nix
index 0cfc7d5..fb273be 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -11,10 +11,6 @@ with pkgs;
 {
   # Kernel configuration
   boot = {
-    blacklistedKernelModules = [
-      "btusb"
-      "bluetooth"
-    ];
     # ZFS Arc size and Nuphy keyboard FN settings
     kernelParams = [
       "zfs.zfs_arc_max=8589934592"
diff --git a/modules/audio.nix b/modules/audio.nix
index f84868c..ee1c687 100644
--- a/modules/audio.nix
+++ b/modules/audio.nix
@@ -107,7 +107,9 @@ in
   systemd.packages = [ mpd-mpris ];
   systemd.user.services.mpd-mpris.wantedBy = [ "default.target" ];
 
+  # Enable bluetooth
+  hardware.bluetooth = {
     enable = true;
-    wantedBy = [ "multi-user.target" ];
+    powerOnBoot = false;
   };
 }