diff --git a/hosts/nuc/configuration.nix b/hosts/nuc/configuration.nix
index 741c50e..31e7546 100644
--- a/hosts/nuc/configuration.nix
+++ b/hosts/nuc/configuration.nix
@@ -6,14 +6,14 @@
     ../../common
 
     # services
-    ./pulseaudio.nix
-    ./nfs-server.nix
-    ./mpd.nix
-    ./ympd.nix
-    ./spotifyd.nix
-    ./desktop.nix
-    ./vnc.nix
-    ./webserver.nix
+    ../../shared-services/pulseaudio.nix
+    ../../shared-services/nfs-server.nix
+    ../../shared-services/mpd.nix
+    ../../shared-services/ympd.nix
+    ../../shared-services/spotifyd.nix
+    ../../shared-services/desktop.nix
+    ../../shared-services/vnc.nix
+    ../../shared-services/webserver.nix
   ];
 
   networking.hostName = "nuc";
diff --git a/hosts/nuc/desktop.nix b/shared-services/desktop.nix
similarity index 100%
rename from hosts/nuc/desktop.nix
rename to shared-services/desktop.nix
diff --git a/hosts/nuc/mpd.nix b/shared-services/mpd.nix
similarity index 100%
rename from hosts/nuc/mpd.nix
rename to shared-services/mpd.nix
diff --git a/hosts/nuc/nfs-server.nix b/shared-services/nfs-server.nix
similarity index 100%
rename from hosts/nuc/nfs-server.nix
rename to shared-services/nfs-server.nix
diff --git a/hosts/nuc/pulseaudio.nix b/shared-services/pulseaudio.nix
similarity index 87%
rename from hosts/nuc/pulseaudio.nix
rename to shared-services/pulseaudio.nix
index 7bb6565..cdc48fe 100644
--- a/hosts/nuc/pulseaudio.nix
+++ b/shared-services/pulseaudio.nix
@@ -8,4 +8,5 @@
   hardware.pulseaudio.package = pkgs.pulseaudio;
   hardware.pulseaudio.tcp.enable = true;
   hardware.pulseaudio.tcp.anonymousClients.allowedIpRanges = [ "127.0.0.0/8" "::/64" "10.23.42.0/24" ];
+  environment.variables.PULSE_SERVER = "127.0.0.1";
 }
diff --git a/hosts/nuc/spotifyd.nix b/shared-services/spotifyd.nix
similarity index 100%
rename from hosts/nuc/spotifyd.nix
rename to shared-services/spotifyd.nix
diff --git a/hosts/nuc/vnc.nix b/shared-services/vnc.nix
similarity index 100%
rename from hosts/nuc/vnc.nix
rename to shared-services/vnc.nix
diff --git a/hosts/nuc/webserver.nix b/shared-services/webserver.nix
similarity index 100%
rename from hosts/nuc/webserver.nix
rename to shared-services/webserver.nix
diff --git a/hosts/nuc/ympd.nix b/shared-services/ympd.nix
similarity index 100%
rename from hosts/nuc/ympd.nix
rename to shared-services/ympd.nix