Use FeatureStoreId instead of String

This uses the temporary `OldIdentifier` until we migrate to `Identifier`
Can you just do this.