diff --git a/nixos/modules/services/network-filesystems/orangefs/server.nix b/nixos/modules/services/network-filesystems/orangefs/server.nix
index 9fbf37f0d00a..c198d4764559 100644
--- a/nixos/modules/services/network-filesystems/orangefs/server.nix
+++ b/nixos/modules/services/network-filesystems/orangefs/server.nix
@@ -1,19 +1,16 @@
 { config, lib, pkgs, ...} :
-
-with lib;
-
 let
   cfg = config.services.orangefs.server;
 
-  aliases = mapAttrsToList (alias: url: alias) cfg.servers;
+  aliases = lib.mapAttrsToList (alias: url: alias) cfg.servers;
 
   # Maximum handle number is 2^63
   maxHandle = 9223372036854775806;
 
   # One range of handles for each meta/data instance
-  handleStep = maxHandle / (length aliases) / 2;
+  handleStep = maxHandle / (lib.length aliases) / 2;
 
-  fileSystems = mapAttrsToList (name: fs: ''
+  fileSystems = lib.mapAttrsToList (name: fs: ''
     <FileSystem>
       Name ${name}
       ID ${toString fs.id}
@@ -22,8 +19,8 @@ let
       ${fs.extraConfig}
 
       <MetaHandleRanges>
-      ${concatStringsSep "\n" (
-          imap0 (i: alias:
+      ${lib.concatStringsSep "\n" (
+          lib.imap0 (i: alias:
             let
               begin = i * handleStep + 3;
               end = begin + handleStep - 1;
@@ -32,10 +29,10 @@ let
       </MetaHandleRanges>
 
       <DataHandleRanges>
-      ${concatStringsSep "\n" (
-          imap0 (i: alias:
+      ${lib.concatStringsSep "\n" (
+          lib.imap0 (i: alias:
             let
-              begin = i * handleStep + 3 + (length aliases) * handleStep;
+              begin = i * handleStep + 3 + (lib.length aliases) * handleStep;
               end = begin + handleStep - 1;
             in "Range ${alias} ${toString begin}-${toString end}") aliases
        )}
@@ -56,17 +53,17 @@ let
     DataStorageSpace ${cfg.dataStorageSpace}
     MetaDataStorageSpace ${cfg.metadataStorageSpace}
 
-    BMIModules ${concatStringsSep "," cfg.BMIModules}
+    BMIModules ${lib.concatStringsSep "," cfg.BMIModules}
     ${cfg.extraDefaults}
     </Defaults>
 
     ${cfg.extraConfig}
 
     <Aliases>
-    ${concatStringsSep "\n" (mapAttrsToList (alias: url: "Alias ${alias} ${url}") cfg.servers)}
+    ${lib.concatStringsSep "\n" (lib.mapAttrsToList (alias: url: "Alias ${alias} ${url}") cfg.servers)}
     </Aliases>
 
-    ${concatStringsSep "\n" fileSystems}
+    ${lib.concatStringsSep "\n" fileSystems}
   '';
 
 in {
@@ -74,49 +71,49 @@ in {
 
   options = {
     services.orangefs.server = {
-      enable = mkEnableOption "OrangeFS server";
+      enable = lib.mkEnableOption "OrangeFS server";
 
-      logType = mkOption {
-        type = with types; enum [ "file" "syslog" ];
+      logType = lib.mkOption {
+        type = with lib.types; enum [ "file" "syslog" ];
         default = "syslog";
         description = "Destination for log messages.";
       };
 
-      dataStorageSpace = mkOption {
-        type = types.nullOr types.str;
+      dataStorageSpace = lib.mkOption {
+        type = lib.types.nullOr lib.types.str;
         default = null;
         example = "/data/storage";
         description = "Directory for data storage.";
       };
 
-      metadataStorageSpace = mkOption {
-        type = types.nullOr types.str;
+      metadataStorageSpace = lib.mkOption {
+        type = lib.types.nullOr lib.types.str;
         default = null;
         example = "/data/meta";
         description = "Directory for meta data storage.";
       };
 
-      BMIModules = mkOption {
-        type = with types; listOf str;
+      BMIModules = lib.mkOption {
+        type = with lib.types; listOf str;
         default = [ "bmi_tcp" ];
         example = [ "bmi_tcp" "bmi_ib"];
         description = "List of BMI modules to load.";
       };
 
-      extraDefaults = mkOption {
-        type = types.lines;
+      extraDefaults = lib.mkOption {
+        type = lib.types.lines;
         default = "";
         description = "Extra config for `<Defaults>` section.";
       };
 
-      extraConfig = mkOption {
-        type = types.lines;
+      extraConfig = lib.mkOption {
+        type = lib.types.lines;
         default = "";
         description = "Extra config for the global section.";
       };
 
-      servers = mkOption {
-        type = with types; attrsOf types.str;
+      servers = lib.mkOption {
+        type = with lib.types; attrsOf lib.types.str;
         default = {};
         example = {
           node1 = "tcp://node1:3334";
@@ -125,12 +122,12 @@ in {
         description = "URLs for storage server including port. The attribute names define the server alias.";
       };
 
-      fileSystems = mkOption {
+      fileSystems = lib.mkOption {
         description = ''
           These options will create the `<FileSystem>` sections of config file.
         '';
         default = { orangefs = {}; };
-        example = literalExpression ''
+        example = lib.literalExpression ''
           {
             fs1 = {
               id = 101;
@@ -141,40 +138,40 @@ in {
             };
           }
         '';
-        type = with types; attrsOf (submodule ({ ... } : {
+        type = with lib.types; attrsOf (submodule ({ ... } : {
           options = {
-            id = mkOption {
-              type = types.int;
+            id = lib.mkOption {
+              type = lib.types.int;
               default = 1;
               description = "File system ID (must be unique within configuration).";
             };
 
-            rootHandle = mkOption {
-              type = types.int;
+            rootHandle = lib.mkOption {
+              type = lib.types.int;
               default = 3;
               description = "File system root ID.";
             };
 
-            extraConfig = mkOption {
-              type = types.lines;
+            extraConfig = lib.mkOption {
+              type = lib.types.lines;
               default = "";
               description = "Extra config for `<FileSystem>` section.";
             };
 
-            troveSyncMeta = mkOption {
-              type = types.bool;
+            troveSyncMeta = lib.mkOption {
+              type = lib.types.bool;
               default = true;
               description = "Sync meta data.";
             };
 
-            troveSyncData = mkOption {
-              type = types.bool;
+            troveSyncData = lib.mkOption {
+              type = lib.types.bool;
               default = false;
               description = "Sync data.";
             };
 
-            extraStorageHints = mkOption {
-              type = types.lines;
+            extraStorageHints = lib.mkOption {
+              type = lib.types.lines;
               default = "";
               description = "Extra config for `<StorageHints>` section.";
             };
@@ -186,7 +183,7 @@ in {
 
   ###### implementation
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     environment.systemPackages = [ pkgs.orangefs ];
 
     # orangefs daemon will run as user