diff --git a/src/core/Image.js b/src/core/Image.js
index 23182e8e..2936f19e 100644
--- a/src/core/Image.js
+++ b/src/core/Image.js
@@ -1,7 +1,7 @@
 const Data = require('./Data')
 const ImageArtifactType = require('./ImageArtifactType')
 const {findOne} = require('../lib/store')
-const {mapOf} = require('../lib/common')
+const { mapOf } = require('../server/lib')
 
 const store = () => Data.getStore(Image)
 
diff --git a/src/lib/common.js b/src/lib/common.js
index cd0f9d2e..0fd2b0db 100644
--- a/src/lib/common.js
+++ b/src/lib/common.js
@@ -31,22 +31,6 @@ function any(list) {
 	return list.reduce((t, i) => t || i, false)
 }
 
-/**
- *
- * {a: {}, b: {}, ...} -> Map (a: Class, b: Class)
- *
- * @param Class
- * @param object
- */
-function mapOf(Class, object) {
-	return Object
-		.entries(object)
-		.reduce((map, i) => (
-			map.set(i[0], new Class(i[1]))
-		), new Map())
-}
-
 exports.compose = compose
 exports.all = all
 exports.any = any
-exports.mapOf = mapOf
diff --git a/src/server/lib.js b/src/server/lib.js
new file mode 100644
index 00000000..49261bd7
--- /dev/null
+++ b/src/server/lib.js
@@ -0,0 +1,14 @@
+/**
+ *
+ * {a: {}, b: {}, ...} -> Map (a: Class, b: Class)
+ *
+ * @param Class
+ * @param object
+ */
+exports.mapOf = function mapOf(Class, object) {
+    return Object
+        .entries(object)
+        .reduce((map, i) => (
+            map.set(i[0], new Class(i[1]))
+        ), new Map())
+}