diff --git a/stix2/sources/filesystem.py b/stix2/sources/filesystem.py
index 0613ac0..e16ee0c 100644
--- a/stix2/sources/filesystem.py
+++ b/stix2/sources/filesystem.py
@@ -13,7 +13,7 @@ import json
 import os
 
 from stix2 import Bundle
-from stix2.sources import DataSink, DataSource, DataStore
+from stix2.sources import DataSink, DataSource, DataStore, Filter
 
 
 class FileSystemStore(DataStore):
@@ -78,11 +78,7 @@ class FileSystemSource(DataSource):
         """
         """
         query = [
-            {
-                "field": "id",
-                "op": "=",
-                "value": stix_id
-            }
+            Filter("id", "=", stix_id)
         ]
 
         all_data = self.query(query=query, _composite_filters=_composite_filters)
diff --git a/stix2/sources/memory.py b/stix2/sources/memory.py
index 24f3c1f..2f45d68 100644
--- a/stix2/sources/memory.py
+++ b/stix2/sources/memory.py
@@ -22,7 +22,7 @@ import json
 import os
 
 from stix2 import Bundle
-from stix2.sources import DataSink, DataSource, DataStore
+from stix2.sources import DataSink, DataSource, DataStore, Filter
 from stix2validator import validate_string
 
 
@@ -205,11 +205,7 @@ class MemorySource(DataSource):
 
         # if there are filters from the composite level, process full query
         query = [
-            {
-                "field": "id",
-                "op": "=",
-                "value": stix_id
-            }
+            Filter("id", "=", stix_id)
         ]
 
         all_data = self.query(query=query, _composite_filters=_composite_filters)
diff --git a/stix2/sources/taxii.py b/stix2/sources/taxii.py
index 47ad8ed..4edeeed 100644
--- a/stix2/sources/taxii.py
+++ b/stix2/sources/taxii.py
@@ -12,7 +12,7 @@ TODO: Test everything
 
 import json
 
-from stix2.sources import DataSink, DataSource, DataStore, make_id
+from stix2.sources import DataSink, DataSource, DataStore, Filter, make_id
 
 TAXII_FILTERS = ['added_after', 'id', 'type', 'version']
 
@@ -89,16 +89,8 @@ class TAXIICollectionSource(DataSource):
         """
         # make query in TAXII query format since 'id' is TAXII field
         query = [
-            {
-                "field": "match[id]",
-                "op": "=",
-                "value": stix_id
-            },
-            {
-                "field": "match[version]",
-                "op": "=",
-                "value": "all"
-            }
+            Filter("match[id]", "=", stix_id),
+            Filter("match[version]", "=", "all")
         ]
 
         all_data = self.query(query=query, _composite_filters=_composite_filters)