diff --git a/nixos/profiles/services/pipewire/default.nix b/nixos/profiles/services/pipewire/default.nix
index 003df59..1b174cc 100644
--- a/nixos/profiles/services/pipewire/default.nix
+++ b/nixos/profiles/services/pipewire/default.nix
@@ -7,9 +7,6 @@
     pulse.enable = true;
     jack.enable = true;
     alsa.enable = true;
+    systemWide = true;
   };
-
-  environment.globalPersistence.user.directories = [
-    ".local/state/wireplumber"
-  ];
 }
diff --git a/nixos/profiles/users/rebmit/default.nix b/nixos/profiles/users/rebmit/default.nix
index 7fc125e..9d5ffac 100644
--- a/nixos/profiles/users/rebmit/default.nix
+++ b/nixos/profiles/users/rebmit/default.nix
@@ -1,7 +1,14 @@
-{ config, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 let
   uid = config.ids.uids.rebmit;
   homeDirectory = "/home/rebmit";
+  groupNameIfPresent =
+    name: lib.optional (config.users.groups ? ${name}) config.users.groups.${name}.name;
 in
 {
   programs.fish.enable = true;
@@ -12,9 +19,12 @@ in
     isNormalUser = true;
     shell = pkgs.fish;
     home = homeDirectory;
-    extraGroups = with config.users.groups; [
-      wheel.name
-    ];
+    extraGroups =
+      with config.users.groups;
+      [
+        wheel.name
+      ]
+      ++ groupNameIfPresent "pipewire";
     openssh.authorizedKeys.keyFiles = config.users.users.root.openssh.authorizedKeys.keyFiles;
   };