This takes some reading but it shows that it isn't clear cut. It does list uncontrolled diabetes separately. I'm obese, but losing weight and we discuss thos in the diet groups I'm in, the truth is that we don't know what's happening inside our bodies when we are obese, even if we feel well and full of energy. Chances are that we could easily have four co-morbidities going on. A BMI over 30 starts to higher your risks, at 40 you are in a dangerous group.
www.lshtm.ac.uk/newsevents/news/2020/risk-factors-covid-19-death-revealed-worlds-largest-analysis-patient-records.
You click in 'the largest study' and the graphs come up.
The study done on 44'000 Chinese people showed, diabetes, pulmonary and vascular issues (including vascular dementia) were the main co-morbidities.
Interestingly deprivation is mentioned again and again. But we already know that a life of poverty shortens lives and makes us more susceptible to disease.