diff --git a/uniqueness.module b/uniqueness.module
index e8124a5..338e92d 100644
--- a/uniqueness.module
+++ b/uniqueness.module
@@ -79,23 +79,31 @@ function uniqueness_help($path, $arg) {
 }
 
 /**
- * Implements hook_content_extra_fields().
+ * Implements hook_field_extra_fields().
  *
- * Allows the inline uniqueness field to be sorted on the manage fields page if
- * CCK is installed.
+ * Allows the inline uniqueness field to be sorted on the manage fields page for
+ * any content type for which it is enabled.
  */
-function uniqueness_content_extra_fields() {
-  // Check that the inline widget is enabled
-  $widget_types = variable_get('uniqueness_widgets', array(UNIQUENESS_WIDGET_INLINE));
-  if (!in_array(UNIQUENESS_WIDGET_INLINE, $widget_types)) {
-    return array();
+function uniqueness_field_extra_fields() {
+  $extras = array();
+  if (in_array(UNIQUENESS_WIDGET_INLINE, variable_get('uniqueness_widgets', array(UNIQUENESS_WIDGET_INLINE)))) {
+    // The inline widget is enabled
+    foreach (array_keys(node_type_get_types()) as $type) {
+      $v = variable_get('uniqueness_type_' . $type, array());
+      if (!empty($v)) {
+        $extras['node'][$type] = array(
+          'form' => array(
+            'uniqueness' => array(
+              'label' => filter_xss_admin(variable_get('uniqueness_default_title', t('Related content'))),
+              'description' => t('Uniqueness inline widget.'),
+              'weight' => 0,
+            ),
+          ),
+        );
+      }
+    }
   }
 
-  $extras['uniqueness'] = array(
-    'label' => filter_xss_admin(variable_get('uniqueness_default_title', t('Related content'))),
-    'description' => t('Uniqueness inline widget.'),
-  );
-
   return $extras;
 }