diff --git a/hosts/apollo/configuration.nix b/hosts/apollo/configuration.nix
index d4a6f53b..d31ae89b 100644
--- a/hosts/apollo/configuration.nix
+++ b/hosts/apollo/configuration.nix
@@ -41,15 +41,6 @@ cdark_net = {
   ip4address = "172.20.71.2";
 };
 
-services = {
-  mpd = {
-      enable = true;
-      user = me.user;
-      group = "users";
-      network.listenAddress = "::0";
-      musicDirectory = "/home/${me.user}/data/aktuell/media/musik";
-  };
-};
 
 
 }
diff --git a/system/modules/laptop.nix b/system/modules/laptop.nix
index 4583c97c..7850190e 100644
--- a/system/modules/laptop.nix
+++ b/system/modules/laptop.nix
@@ -1,5 +1,11 @@
 { config, pkgs, lib, ... }:
 with lib;
+
+let
+
+  me = config.m-0.private.me;
+
+in
 {
   options = {
     m-0.laptop.enable = mkOption {
@@ -12,8 +18,31 @@ with lib;
       networkmanager.enable = true;
     };
     i18n.consoleKeyMap = "neo";
-    hardware.pulseaudio.enable = true;
+
+    sound.enable = true;
+    hardware.pulseaudio = {
+      enable = true;
+      tcp = {
+        enable = true;
+        anonymousClients.allowedIpRanges = [ "127.0.0.1" "::1" ];
+      };
+    };
+
     services = {
+      mpd = {
+          enable = true;
+          user = me.user;
+          group = "users";
+          network.listenAddress = "::1";
+          musicDirectory = "/home/${me.user}/data/aktuell/media/musik";
+          extraConfig = ''
+          audio_output {
+                type "pulse"
+                name "Pulseaudio"
+                server "localhost"
+          }
+          '';
+      };
       xserver = {
         enable = true;
         layout = "de";