fix: use kwargs registry directly and store it correctly in model_config

fix: use kwargs registry directly and store it correctly in model_config #2388