diff --git a/apachesolr.index.inc b/apachesolr.index.inc
index e9025f3..be57971 100644
--- a/apachesolr.index.inc
+++ b/apachesolr.index.inc
@@ -1034,13 +1034,13 @@ function apachesolr_index_nodeapi_mass_update($nodes, $table = NULL) {
     if ($published_ids) {
       db_update($table)
         ->fields(array('changed' => REQUEST_TIME, 'status' => 1))
-        ->condition('nid', array_keys($published_ids), 'IN')
+        ->condition('entity_id', array_keys($published_ids), 'IN')
         ->execute();
     }
     if ($unpublished_ids) {
       db_update($table)
         ->fields(array('changed' => REQUEST_TIME, 'status' => 0))
-        ->condition('nid', array_keys($unpublished_ids), 'IN')
+        ->condition('entity_id', array_keys($unpublished_ids), 'IN')
         ->execute();
     }
     return TRUE;
@@ -1083,7 +1083,7 @@ function apachesolr_index_nodeapi_mass_delete($nodes, $table = NULL) {
     apachesolr_set_last_index_updated($env_id, REQUEST_TIME);
     // There was no exception, so update the table.
     db_delete($table)
-      ->condition('nid', $nids, 'IN')
+      ->condition('entity_id', $nids, 'IN')
       ->execute();
     return TRUE;
   }
diff --git a/apachesolr.module b/apachesolr.module
index 9d76d18..b730aaf 100644
--- a/apachesolr.module
+++ b/apachesolr.module
@@ -543,7 +543,7 @@ function apachesolr_mark_entity($entity_type, $entity_id) {
            ->fields('node', array('nid'))
            ->where("uid = :uid", array(':uid' => $account->uid));
          $update = db_update($table)
-           ->condition('nid', $nids, 'IN')
+           ->condition('entity_id', $nids, 'IN')
            ->fields(array('changed' => REQUEST_TIME))
            ->execute();
      }
@@ -578,7 +578,7 @@ function apachesolr_taxonomy_term_update($term) {
         ->fields('taxonomy_index', array('nid'))
         ->where("tid = :tid", array(':tid' => $term->tid));
       $update = db_update($table)
-        ->condition('nid', $nids, 'IN')
+        ->condition('entity_id', $nids, 'IN')
         ->fields(array('changed' => REQUEST_TIME))
         ->execute();
   }
@@ -663,7 +663,7 @@ function apachesolr_node_type_update($info) {
           ->fields('node', array('nid'))
           ->where("type = :new OR type = :old", array(':new' => $info->type, ':old' => $info->old_type));
         $update = db_update($table)
-          ->condition('nid', $nids, 'IN')
+          ->condition('entity_id', $nids, 'IN')
           ->fields(array('changed' => REQUEST_TIME))
           ->execute();
     }