diff --git a/flake.lock b/flake.lock
index 8e62a17..bfac669 100644
--- a/flake.lock
+++ b/flake.lock
@@ -17,11 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1677932085,
-        "narHash": "sha256-+AB4dYllWig8iO6vAiGGYl0NEgmMgGHpy9gzWJ3322g=",
+        "lastModified": 1684049129,
+        "narHash": "sha256-7WB9LpnPNAS8oI7hMoHeKLNhRX7k3CI9uWBRSfmOCCE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3c5319ad3aa51551182ac82ea17ab1c6b0f0df89",
+        "rev": "0470f36b02ef01d4f43c641bbf07020bcab71bf1",
         "type": "github"
       },
       "original": {
diff --git a/flammea.nix b/flammea.nix
index a06ac11..7ea50b4 100644
--- a/flammea.nix
+++ b/flammea.nix
@@ -111,7 +111,7 @@ let mpdStreamingPort = 8080; in
 
   networking.firewall.trustedInterfaces = [ "tailscale0" ];
 
-  services.openssh.forwardX11 = true;
+  services.openssh.settings.X11Forwarding = true;
 
   fileSystems."/mnt/aplysia".device = pkgs.lib.mkOverride 10 "//aplysia.auroch-boa.ts.net/export";
 
@@ -183,14 +183,13 @@ let mpdStreamingPort = 8080; in
     '';
   };
 
-  services.pipewire = {
-    config.pipewire-pulse = {
-      "pulse.properties"."server.address" = [
+  environment.etc."pipewire/pipewire-pulse.conf.d/listen.conf".text = ''
+    pulse.properties = {
+      server.address = [
         "unix:native"
         "tcp:127.0.0.1:4713"
         # "tcp:100.97.134.100:4713"
-      ];
-    };
-  };
-
+      ]
+    }
+  '';
 }
diff --git a/pipewire.nix b/pipewire.nix
index 5f0e4eb..82a9917 100644
--- a/pipewire.nix
+++ b/pipewire.nix
@@ -12,18 +12,18 @@
     pulse.enable = true;
     jack.enable = true;
 
-    media-session.config.bluez-monitor.rules = [
-      {
-        # Matches all cards
-        matches = [ { "device.name" = "~bluez_card.*"; } ];
-        actions = {
-          "update-props" = {
-            "bluez5.reconnect-profiles" = [ "hfp_hf" "hsp_hs" "a2dp_sink" ];
-            "bluez5.msbc-support" = true;
-          };
-        };
-      }
-    ];
+    # media-session.config.bluez-monitor.rules = [
+    #   {
+    #     # Matches all cards
+    #     matches = [ { "device.name" = "~bluez_card.*"; } ];
+    #     actions = {
+    #       "update-props" = {
+    #         "bluez5.reconnect-profiles" = [ "hfp_hf" "hsp_hs" "a2dp_sink" ];
+    #         "bluez5.msbc-support" = true;
+    #       };
+    #     };
+    #   }
+    # ];
   };
 
   environment.systemPackages = with pkgs; [