diff --git a/flake.lock b/flake.lock
index b2054ec..5f204e5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -70,11 +70,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1741692101,
-        "narHash": "sha256-2oLcNkpB39KELhEUMtSxUWr+OLIsYWUsyStMz4Mft4M=",
+        "lastModified": 1741710368,
+        "narHash": "sha256-P9Qt8QQC6cFssiIvNEmj8BabRZS7EWMqCrA3oNj70x4=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "04892169ec614a3ddeb1ca4a8e6a86e9d410d30c",
+        "rev": "2695d53827b4200a195f932a5beb47fe5f9e3213",
         "type": "github"
       },
       "original": {
diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix
index 17b55f8..5f49c5d 100644
--- a/hosts/eddie/configuration.nix
+++ b/hosts/eddie/configuration.nix
@@ -16,7 +16,8 @@
     sops-config
     niri
     kanata
-    filesystems
+    filesystems-filez
+    filesystems-media-server
     sound
   ];
 
diff --git a/hosts/media-server/configuration.nix b/hosts/media-server/configuration.nix
index 817a7a7..034adbb 100644
--- a/hosts/media-server/configuration.nix
+++ b/hosts/media-server/configuration.nix
@@ -4,7 +4,7 @@
   imports = with nix-config.nixosModules; [
       ./hardware-configuration.nix
       sops-config
-      filesystems
+      filesystems-filez
     ];
 
   nixpkgs = {
diff --git a/modules/home/beets/config.yaml b/modules/home/beets/config.yaml
index 78aed4e..5abb073 100644
--- a/modules/home/beets/config.yaml
+++ b/modules/home/beets/config.yaml
@@ -1,4 +1,4 @@
-directory: /mount/filez/media/Music
+directory: /mnt/filez/media/Music
 library: ~/.config/beets/library.db
 asciify_paths: yes
 import:
diff --git a/modules/system/filesystems.nix b/modules/system/filesystems-filez.nix
similarity index 100%
rename from modules/system/filesystems.nix
rename to modules/system/filesystems-filez.nix
diff --git a/modules/system/filesystems-media-server.nix b/modules/system/filesystems-media-server.nix
new file mode 100644
index 0000000..e8822c9
--- /dev/null
+++ b/modules/system/filesystems-media-server.nix
@@ -0,0 +1,17 @@
+{ config, lib, pkgs, ... }:
+
+{
+   fileSystems =
+    let
+      automount-opts = "x-systemd.automount,noauto,users,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s,noperm,uid=1000";
+      # filez-opts = automount-opts + ",credentials=/etc/nixos/filez-secrets";
+      media-server-opts = automount-opts + ",credentials=/etc/nixos/media-server-secrets";
+    in {
+
+      "/mnt/filez/media" = {
+        device = "//media-server/import";
+        fsType = "smb3";
+        options = [ "${media-server-opts}" ];
+      };
+    };
+}