diff --git a/hosts/lemp11/configuration.nix b/hosts/lemp11/configuration.nix
index 1e79dce9..6f76babe 100644
--- a/hosts/lemp11/configuration.nix
+++ b/hosts/lemp11/configuration.nix
@@ -7,6 +7,7 @@
     ./programs.nix
     ./services.nix
 
+    mixins-avahi
     mixins-common
     mixins-zram
     mixins-zsh
diff --git a/hosts/lemp11/services.nix b/hosts/lemp11/services.nix
index 0d5dae7a..8aaa162c 100644
--- a/hosts/lemp11/services.nix
+++ b/hosts/lemp11/services.nix
@@ -2,12 +2,6 @@
   services = {
     auto-cpufreq.enable = true;
 
-    avahi = {
-      enable = true;
-      nssmdns4 = true;
-      openFirewall = true;
-    };
-
     blueman.enable = true;
     gvfs.enable = true;
     openssh.enable = true;
diff --git a/hosts/nixedo/configuration.nix b/hosts/nixedo/configuration.nix
index b081f823..3c6a0328 100644
--- a/hosts/nixedo/configuration.nix
+++ b/hosts/nixedo/configuration.nix
@@ -9,6 +9,7 @@
     ./hardware-configuration.nix
     ./secrets.nix
 
+    mixins-avahi
     mixins-common
     mixins-fzf
     mixins-openssh
diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix
index 20bccb5e..c50ad96f 100644
--- a/hosts/t480/configuration.nix
+++ b/hosts/t480/configuration.nix
@@ -12,6 +12,7 @@ in
     ./secrets.nix
 
     editor-nvim
+    mixins-avahi
     mixins-bluetooth
     mixins-common
     mixins-direnv
@@ -119,18 +120,12 @@ in
   ];
 
   networking.hosts = {
+    "192.168.1.180" = [ "lemp11" ];
     "192.168.1.116" = [ "nixedo" ];
   };
 
   services = {
     auto-cpufreq.enable = true;
-
-    avahi = {
-      enable = true;
-      nssmdns4 = true;
-      openFirewall = true;
-    };
-
     gvfs.enable = true;
     power-profiles-daemon.enable = false;
     printing.enable = true;
diff --git a/modules/mixins/avahi.nix b/modules/mixins/avahi.nix
new file mode 100644
index 00000000..471b7ca6
--- /dev/null
+++ b/modules/mixins/avahi.nix
@@ -0,0 +1,12 @@
+{
+  services.avahi = {
+    enable = true;
+    nssmdns4 = true;
+    openFirewall = true;
+
+    publish = {
+      enable = true;
+      addresses = true;
+    };
+  };
+}