diff --git a/capa/features/address.py b/capa/features/address.py
index 15f5c7d5..61c3bc43 100644
--- a/capa/features/address.py
+++ b/capa/features/address.py
@@ -74,7 +74,7 @@ class ThreadAddress(Address):
         return f"thread(tid: {self.tid})"
 
     def __hash__(self):
-        return hash((self.ppid, self.pid, self.tid))
+        return hash((self.process, self.tid))
 
     def __eq__(self, other):
         assert isinstance(other, ThreadAddress)
diff --git a/capa/features/extractors/null.py b/capa/features/extractors/null.py
index 6820e6ba..facaa692 100644
--- a/capa/features/extractors/null.py
+++ b/capa/features/extractors/null.py
@@ -2,7 +2,7 @@ from typing import Dict, List, Tuple, Union, TypeAlias
 from dataclasses import dataclass
 
 from capa.features.common import Feature
-from capa.features.address import NO_ADDRESS, Address
+from capa.features.address import NO_ADDRESS, Address, ThreadAddress, ProcessAddress
 from capa.features.extractors.base_extractor import (
     BBHandle,
     InsnHandle,
@@ -88,7 +88,7 @@ class ThreadFeatures:
 @dataclass
 class ProcessFeatures:
     features: List[Tuple[Address, Feature]]
-    threads: Dict[Address, ThreadFeatures]
+    threads: Dict[ThreadAddress, ThreadFeatures]
 
 
 @dataclass
@@ -96,7 +96,7 @@ class NullDynamicFeatureExtractor(DynamicFeatureExtractor):
     base_address: Address
     global_features: List[Feature]
     file_features: List[Tuple[Address, Feature]]
-    processes: Dict[Address, ProcessFeatures]
+    processes: Dict[ProcessAddress, ProcessFeatures]
 
     def extract_global_features(self):
         for feature in self.global_features:
@@ -108,7 +108,7 @@ class NullDynamicFeatureExtractor(DynamicFeatureExtractor):
 
     def get_processes(self):
         for address in sorted(self.processes.keys()):
-            yield ProcessHandle(address=address, inner={}, pid=address.pid)
+            yield ProcessHandle(address=address, inner={})
 
     def extract_process_features(self, p):
         for addr, feature in self.processes[p.address].features:
@@ -116,7 +116,7 @@ class NullDynamicFeatureExtractor(DynamicFeatureExtractor):
 
     def get_threads(self, p):
         for address in sorted(self.processes[p].threads.keys()):
-            yield ThreadHandle(address=address, inner={}, tid=address.pid)
+            yield ThreadHandle(address=address, inner={})
 
     def extract_thread_features(self, p, t):
         for addr, feature in self.processes[p.address].threads[t.address].features:
diff --git a/capa/features/freeze/__init__.py b/capa/features/freeze/__init__.py
index 2061710a..c5dd5a43 100644
--- a/capa/features/freeze/__init__.py
+++ b/capa/features/freeze/__init__.py
@@ -50,7 +50,7 @@ class AddressType(str, Enum):
 
 class Address(HashableModel):
     type: AddressType
-    value: Union[int, Tuple[int, int], Tuple[int, int, int], None]
+    value: Union[int, Tuple[int, ...], None]
 
     @classmethod
     def from_capa(cls, a: capa.features.address.Address) -> "Address":
@@ -73,7 +73,7 @@ class Address(HashableModel):
             return cls(type=AddressType.PROCESS, value=(a.ppid, a.pid))
 
         elif isinstance(a, capa.features.address.ThreadAddress):
-            return cls(type=AddressType.THREAD, value=(a.ppid, a.pid, a.tid))
+            return cls(type=AddressType.THREAD, value=(a.process.ppid, a.process.pid, a.tid))
 
         elif isinstance(a, capa.features.address.DynamicAddress):
             return cls(type=AddressType.DYNAMIC, value=(a.id, a.return_address))