diff --git a/fuelclient/objects/node.py b/fuelclient/objects/node.py
index 20f4a7f..ff0db4a 100644
--- a/fuelclient/objects/node.py
+++ b/fuelclient/objects/node.py
@@ -152,7 +152,5 @@ class NodeCollection(object):
         return cls(Node.get_all())
 
     def filter_by_env_id(self, env_id):
-        self.collection = filter(
-            lambda node: node.env_id == env_id,
-            self.collection
-        )
+        predicate = lambda node: node.data['cluster'] == env_id
+        self.collection = filter(predicate, self.collection)
diff --git a/fuelclient/objects/nodegroup.py b/fuelclient/objects/nodegroup.py
index bd99365..7781451 100644
--- a/fuelclient/objects/nodegroup.py
+++ b/fuelclient/objects/nodegroup.py
@@ -81,7 +81,5 @@ class NodeGroupCollection(object):
         return cls(NodeGroup.get_all())
 
     def filter_by_env_id(self, env_id):
-        self.collection = filter(
-            lambda group: group.env_id == env_id,
-            self.collection
-        )
+        predicate = lambda group: group.data['cluster'] == env_id
+        self.collection = filter(predicate, self.collection)