diff --git a/i3.nix b/i3.nix
index 4f6c2e6..c5d974e 100644
--- a/i3.nix
+++ b/i3.nix
@@ -123,7 +123,6 @@
   services.telepathy.enable = true;
   networking.networkmanager.enable = true;
   services.upower.enable = config.powerManagement.enable;
-  hardware.bluetooth.enable = true;
   programs.dconf.enable = true;
   services.flatpak.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
   # Needed for themes and backgrounds
@@ -133,6 +132,11 @@
     "${glib_networking.out}/lib/gio/modules"
     "${gvfs}/lib/gio/modules" ];
 
+  hardware.bluetooth = {
+    enable = true;
+    package = pkgs.bluezFull;
+  };
+
   hardware.pulseaudio = {
     enable = true;
     zeroconf.discovery.enable = true;
@@ -140,6 +144,7 @@
       flat-volumes = "no";
     };
     package = pkgs.pulseaudioFull;
+    extraModules = [ pkgs.pulseaudio-modules-bt ];
   };
 
 }
diff --git a/petalius.nix b/petalius.nix
index a4a947a..cc4c9df 100644
--- a/petalius.nix
+++ b/petalius.nix
@@ -109,9 +109,4 @@
   };
   systemd.services.wireguard-wg0.wantedBy = pkgs.lib.mkOverride 10 [];
 
-  hardware.bluetooth = {
-    enable = true;
-    package = pkgs.bluezFull;
-  };
-
 }