Use FeatureStoreId instead of String

This uses the temporary `OldIdentifier` until we migrate to `Identifier`
The macro isn't on `Identifier`, should i add it there also?