diff --git a/src/defaultPlugins.js b/src/defaultPlugins.js
index 1d6532522..d0f4f3ba4 100644
--- a/src/defaultPlugins.js
+++ b/src/defaultPlugins.js
@@ -1,3 +1,4 @@
+import objectFit from './plugins/objectFit'
 import objectPosition from './plugins/objectPosition'
 import opacity from './plugins/opacity'
 import outline from './plugins/outline'
@@ -24,6 +25,7 @@ import zIndex from './plugins/zIndex'
 
 export default function (config) {
   return [
+    config.modules.objectFit === false ? () => {} : objectFit(),
     config.modules.objectPosition === false ? () => {} : objectPosition(),
     config.modules.opacity === false ? () => {} : opacity(),
     config.modules.outline === false ? () => {} : outline(),
diff --git a/src/generators/objectFit.js b/src/generators/objectFit.js
deleted file mode 100644
index e6723fdc7..000000000
--- a/src/generators/objectFit.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import defineClasses from '../util/defineClasses'
-
-export default function() {
-  return defineClasses({
-    'object-contain': { 'object-fit': 'contain' },
-    'object-cover': { 'object-fit': 'cover' },
-    'object-fill': { 'object-fit': 'fill' },
-    'object-none': { 'object-fit': 'none' },
-    'object-scale-down': { 'object-fit': 'scale-down' },
-  })
-}
diff --git a/src/plugins/objectFit.js b/src/plugins/objectFit.js
new file mode 100644
index 000000000..9452858c8
--- /dev/null
+++ b/src/plugins/objectFit.js
@@ -0,0 +1,11 @@
+export default function () {
+  return function ({ addUtilities, config }) {
+    addUtilities({
+      '.object-contain': { 'object-fit': 'contain' },
+      '.object-cover': { 'object-fit': 'cover' },
+      '.object-fill': { 'object-fit': 'fill' },
+      '.object-none': { 'object-fit': 'none' },
+      '.object-scale-down': { 'object-fit': 'scale-down' },
+    }, config('modules.objectFit'))
+  }
+}
diff --git a/src/utilityModules.js b/src/utilityModules.js
index 72c723519..aec9132b2 100644
--- a/src/utilityModules.js
+++ b/src/utilityModules.js
@@ -24,7 +24,6 @@ import maxWidth from './generators/maxWidth'
 import minHeight from './generators/minHeight'
 import minWidth from './generators/minWidth'
 import negativeMargin from './generators/negativeMargin'
-import objectFit from './generators/objectFit'
 
 export default [
   { name: 'lists', generator: lists },
@@ -53,5 +52,4 @@ export default [
   { name: 'minHeight', generator: minHeight },
   { name: 'minWidth', generator: minWidth },
   { name: 'negativeMargin', generator: negativeMargin },
-  { name: 'objectFit', generator: objectFit },
 ]