Best Practices for Linking Device IDs with UIDs in Mixpanel

Hi all I have been using mixpanel last few months and been loving it. Have a problem recently though. Realised my device ids are merged with uid from my database. I would like the main distinct id to be the uid and all the device ids linked to that. What is the best way to deal with this? Also to then match analytics data with my business intelligence data do I need to export data from mixpanel and database to a datawarehouse like bigquery? I was not aware of simplified ID and I am using currently Original Id for this project. What would be the best way, to proceed now. I want the distinct ID to be UID or at least be able to separate it from the distinctID list, and give separate property to the id cluster. Because all my database data is mapped to that uid