diff --git a/src/newgrf_storage.h b/src/newgrf_storage.h
index 3db901b984..0f962d6681 100644
--- a/src/newgrf_storage.h
+++ b/src/newgrf_storage.h
@@ -186,10 +186,10 @@ void AddChangedPersistentStorage(BasePersistentStorageArray *storage);
 
 typedef PersistentStorageArray<int32_t, 16> OldPersistentStorage;
 
-typedef uint32_t PersistentStorageID;
+using PersistentStorageID = PoolID<uint32_t, struct PersistentStorageIDTag, 0xFF000, 0xFFFFF>;
 
 struct PersistentStorage;
-typedef Pool<PersistentStorage, PersistentStorageID, 1, 0xFF000> PersistentStoragePool;
+using PersistentStoragePool = Pool<PersistentStorage, PersistentStorageID, 1, PersistentStorageID::End().base()>;
 
 extern PersistentStoragePool _persistent_storage_pool;