diff --git a/machines/base-server.scm b/machines/base-server.scm
new file mode 100644
index 0000000..1788802
--- /dev/null
+++ b/machines/base-server.scm
@@ -0,0 +1,4 @@
+(define-module (machines base-desktop)
+  #:use-module (system base-system))
+
+%metznet-base-server-system
diff --git a/system/base-system.scm b/system/base-system.scm
index ad22a6e..ec559c7 100644
--- a/system/base-system.scm
+++ b/system/base-system.scm
@@ -134,15 +134,18 @@
 ; 1) need to create user directory on login
 ; 2) need to have /bin/zsh available to use as shell
 
+(define %metznet-nslcd-config (nslcd-configuration
+                                (base "dc=metznet,dc=ca")
+                                (log '("/var/log/nslcd" debug))
+                                (pam-services (list "su" "login" "password" "ssh" "passwd"))
+                                (binddn (or (getenv "LDAP_BINDDN") ""))
+                                (bindpw (or (getenv "LDAP_BINDPW") ""))
+                                (uri (list "ldap://ldap.metznet.ca"))))
+
 (define %metznet-desktop-services
   (append (list (service openssh-service-type)
                 (service krb5-service-type %metznet-krb5-config)
-                (service nslcd-service-type (nslcd-configuration (base "dc=metznet,dc=ca")
-                                                                 (log '("/var/log/nslcd" debug))
-                                                                 (pam-services (list "su" "login" "password" "ssh" "passwd"))
-                                                                 (binddn (or (getenv "LDAP_BINDDN") ""))
-                                                                 (bindpw (or (getenv "LDAP_BINDPW") ""))
-                                                                 (uri (list "ldap://ldap.metznet.ca")))))
+                (service nslcd-service-type %metznet-nslcd-config))
           (modify-services %desktop-services
                    (guix-service-type config => (guix-configuration
                      (inherit config)
@@ -171,6 +174,7 @@
 (define %metznet-server-services (append (list
                                              (service openssh-service-type)
                                              (service krb5-service-type %metznet-krb5-config)
+                                             (service nslcd-service-type %metznet-nslcd-config)
                                              (service dhcp-client-service-type)
                                              (openvpn-client-service
                                                #:config (openvpn-client-configuration