diff --git a/modules/audio.nix b/modules/audio.nix
index 15cafe8..724d88c 100644
--- a/modules/audio.nix
+++ b/modules/audio.nix
@@ -8,18 +8,14 @@ in {
   # Enable ALSA
   sound.enable = true;
 
-  # Configure pipewire as sound server
-  services.pipewire = {
+  # Configure PulseAudio with mopidy tweaks
+  hardware.pulseaudio = {
     enable = true;
-    alsa = {
+    tcp = {
       enable = true;
-      support32Bit = true;
+      anonymousClients.allowedIpRanges = [ "127.0.0.1" ];
     };
-    pulse.enable = true;
-    jack.enable = true;
-    media-session.enable = true;
   };
-  security.rtkit.enable = true;
 
   # Set up Mopidy
   services.mopidy = {
diff --git a/modules/gui.nix b/modules/gui.nix
index d47edaf..71b6e9b 100644
--- a/modules/gui.nix
+++ b/modules/gui.nix
@@ -123,6 +123,8 @@ in {
   programs.browserpass.enable = true;
 
   # Enable WebRTC screensharing
+  services.pipewire.enable = true;
+
   xdg.portal = {
     enable = true;
     extraPortals = with pkgs; [ xdg-desktop-portal-wlr ];